Not sure what this merge is... will investigate

Merge branch 'master' of https://github.com/LukeShu/leaguer

14 files changed, 1 insertions, 1 deletions

diff --git a/db/migrate/20140304015824_create_servers.rb b/db/migrate/20140304020124_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015824_create_servers.rb
+++ b/db/migrate/20140304020124_create_servers.rb
diff --git a/db/migrate/20140304015826_create_tournaments.rb b/db/migrate/20140304020126_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304015826_create_tournaments.rb
+++ b/db/migrate/20140304020126_create_tournaments.rb
diff --git a/db/migrate/20140304015828_create_matches.rb b/db/migrate/20140304020129_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015828_create_matches.rb
+++ b/db/migrate/20140304020129_create_matches.rb
diff --git a/db/migrate/20140304015831_create_teams.rb b/db/migrate/20140304020131_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015831_create_teams.rb
+++ b/db/migrate/20140304020131_create_teams.rb
diff --git a/db/migrate/20140304015835_create_users.rb b/db/migrate/20140304020135_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304015835_create_users.rb
+++ b/db/migrate/20140304020135_create_users.rb
diff --git a/db/migrate/20140304015837_create_user_team_pairs.rb b/db/migrate/20140304020138_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015837_create_user_team_pairs.rb
+++ b/db/migrate/20140304020138_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015839_create_team_match_pairs.rb b/db/migrate/20140304020140_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015839_create_team_match_pairs.rb
+++ b/db/migrate/20140304020140_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015842_create_alerts.rb b/db/migrate/20140304020142_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015842_create_alerts.rb
+++ b/db/migrate/20140304020142_create_alerts.rb
diff --git a/db/migrate/20140304015844_create_pms.rb b/db/migrate/20140304020144_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015844_create_pms.rb
+++ b/db/migrate/20140304020144_create_pms.rb
diff --git a/db/migrate/20140304015846_create_games.rb b/db/migrate/20140304020147_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304015846_create_games.rb
+++ b/db/migrate/20140304020147_create_games.rb
diff --git a/db/migrate/20140304015849_create_game_attributes.rb b/db/migrate/20140304020149_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015849_create_game_attributes.rb
+++ b/db/migrate/20140304020149_create_game_attributes.rb
diff --git a/db/migrate/20140304015851_create_server_settings.rb b/db/migrate/20140304020151_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015851_create_server_settings.rb
+++ b/db/migrate/20140304020151_create_server_settings.rb
diff --git a/db/migrate/20140304015859_create_tournament_options.rb b/db/migrate/20140304020200_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015859_create_tournament_options.rb
+++ b/db/migrate/20140304020200_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index 4e1da7f..60a6169 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: 20140304015859) do
+ActiveRecord::Schema.define(version: 20140304020200) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"