Booted the strap

14 files changed, 10 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 630e133..f4e5b09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.2'
 
+gem 'bootstrap-sass'
+
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 564ce87..75d27b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,6 +27,8 @@ GEM
       tzinfo (~> 0.3.37)
     arel (4.0.2)
     atomic (1.1.14)
+    bootstrap-sass (3.1.1.0)
+      sass (~> 3.2)
     builder (3.1.4)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -113,6 +115,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass
   coffee-rails (~> 4.0.0)
   jbuilder (~> 1.2)
   jquery-rails
diff --git a/db/migrate/20140304014838_create_servers.rb b/db/migrate/20140304014908_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304014838_create_servers.rb
+++ b/db/migrate/20140304014908_create_servers.rb
diff --git a/db/migrate/20140304014840_create_tournaments.rb b/db/migrate/20140304014910_create_tournaments.rb
index 2095590..2095590 100644
--- a/db/migrate/20140304014840_create_tournaments.rb
+++ b/db/migrate/20140304014910_create_tournaments.rb
diff --git a/db/migrate/20140304014842_create_matches.rb b/db/migrate/20140304014913_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304014842_create_matches.rb
+++ b/db/migrate/20140304014913_create_matches.rb
diff --git a/db/migrate/20140304014844_create_teams.rb b/db/migrate/20140304014915_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304014844_create_teams.rb
+++ b/db/migrate/20140304014915_create_teams.rb
diff --git a/db/migrate/20140304014846_create_users.rb b/db/migrate/20140304014917_create_users.rb
index 6a500e5..6a500e5 100644
--- a/db/migrate/20140304014846_create_users.rb
+++ b/db/migrate/20140304014917_create_users.rb
diff --git a/db/migrate/20140304014848_create_user_team_pairs.rb b/db/migrate/20140304014919_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304014848_create_user_team_pairs.rb
+++ b/db/migrate/20140304014919_create_user_team_pairs.rb
diff --git a/db/migrate/20140304014850_create_team_match_pairs.rb b/db/migrate/20140304014921_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304014850_create_team_match_pairs.rb
+++ b/db/migrate/20140304014921_create_team_match_pairs.rb
diff --git a/db/migrate/20140304014852_create_alerts.rb b/db/migrate/20140304014923_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304014852_create_alerts.rb
+++ b/db/migrate/20140304014923_create_alerts.rb
diff --git a/db/migrate/20140304014855_create_pms.rb b/db/migrate/20140304014926_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304014855_create_pms.rb
+++ b/db/migrate/20140304014926_create_pms.rb
diff --git a/db/migrate/20140304014857_create_server_settings.rb b/db/migrate/20140304014928_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304014857_create_server_settings.rb
+++ b/db/migrate/20140304014928_create_server_settings.rb
diff --git a/db/schema.rb b/db/schema.rb
index 88dfa1a..5d839f4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140304014857) do
+ActiveRecord::Schema.define(version: 20140304014928) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/generate.sh b/generate.sh
index 666869c..36a74ef 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-#
+# The generate.sh bash file is used to generate all of the necessary .rb files to run the website
+# 
+
+
 # To Start Rails Server:
 #   bundle exec rails server
 #