Merge branch 'clean'

Conflicts:
	generate.sh

20 files changed, 1 insertions, 9 deletions

diff --git a/db/migrate/20140304041711_add_index_to_user_email.rb b/db/migrate/20140304041711_add_index_to_user_email.rb
deleted file mode 100644
index 1bc4c56..0000000
--- a/db/migrate/20140304041711_add_index_to_user_email.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class AddIndexToUserEmail < ActiveRecord::Migration
-  def change
-  end
-end
diff --git a/db/migrate/20140304041714_add_index_to_user_name.rb b/db/migrate/20140304041714_add_index_to_user_name.rb
deleted file mode 100644
index a77567b..0000000
--- a/db/migrate/20140304041714_add_index_to_user_name.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class AddIndexToUserName < ActiveRecord::Migration
-  def change
-  end
-end
diff --git a/db/migrate/20140304041637_create_servers.rb b/db/migrate/20140304043618_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304041637_create_servers.rb
+++ b/db/migrate/20140304043618_create_servers.rb
diff --git a/db/migrate/20140304041639_create_tournaments.rb b/db/migrate/20140304043620_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304041639_create_tournaments.rb
+++ b/db/migrate/20140304043620_create_tournaments.rb
diff --git a/db/migrate/20140304041641_create_matches.rb b/db/migrate/20140304043622_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140304041641_create_matches.rb
+++ b/db/migrate/20140304043622_create_matches.rb
diff --git a/db/migrate/20140304041643_create_teams.rb b/db/migrate/20140304043624_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304041643_create_teams.rb
+++ b/db/migrate/20140304043624_create_teams.rb
diff --git a/db/migrate/20140304041646_create_alerts.rb b/db/migrate/20140304043626_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304041646_create_alerts.rb
+++ b/db/migrate/20140304043626_create_alerts.rb
diff --git a/db/migrate/20140304041648_create_pms.rb b/db/migrate/20140304043629_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304041648_create_pms.rb
+++ b/db/migrate/20140304043629_create_pms.rb
diff --git a/db/migrate/20140304041650_create_games.rb b/db/migrate/20140304043631_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304041650_create_games.rb
+++ b/db/migrate/20140304043631_create_games.rb
diff --git a/db/migrate/20140304041652_create_users.rb b/db/migrate/20140304043633_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304041652_create_users.rb
+++ b/db/migrate/20140304043633_create_users.rb
diff --git a/db/migrate/20140304041655_create_game_attributes.rb b/db/migrate/20140304043635_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304041655_create_game_attributes.rb
+++ b/db/migrate/20140304043635_create_game_attributes.rb
diff --git a/db/migrate/20140304041657_create_server_settings.rb b/db/migrate/20140304043637_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304041657_create_server_settings.rb
+++ b/db/migrate/20140304043637_create_server_settings.rb
diff --git a/db/migrate/20140304041659_create_user_team_pairs.rb b/db/migrate/20140304043639_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304041659_create_user_team_pairs.rb
+++ b/db/migrate/20140304043639_create_user_team_pairs.rb
diff --git a/db/migrate/20140304041701_create_team_match_pairs.rb b/db/migrate/20140304043642_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304041701_create_team_match_pairs.rb
+++ b/db/migrate/20140304043642_create_team_match_pairs.rb
diff --git a/db/migrate/20140301210808_add_index_to_users_email.rb b/db/migrate/20140304043652_add_index_to_users_email.rb
index 934d23b..934d23b 100644
--- a/db/migrate/20140301210808_add_index_to_users_email.rb
+++ b/db/migrate/20140304043652_add_index_to_users_email.rb
diff --git a/db/migrate/20140301211316_add_index_to_users_user_name.rb b/db/migrate/20140304043654_add_index_to_users_user_name.rb
index 22ca8c3..22ca8c3 100644
--- a/db/migrate/20140301211316_add_index_to_users_user_name.rb
+++ b/db/migrate/20140304043654_add_index_to_users_user_name.rb
diff --git a/db/migrate/20140304041716_add_password_digest_to_users.rb b/db/migrate/20140304043656_add_password_digest_to_users.rb
index 7ad1f62..7ad1f62 100644
--- a/db/migrate/20140304041716_add_password_digest_to_users.rb
+++ b/db/migrate/20140304043656_add_password_digest_to_users.rb
diff --git a/db/migrate/20140304041718_add_remember_token_to_users.rb b/db/migrate/20140304043658_add_remember_token_to_users.rb
index 6d84942..6d84942 100644
--- a/db/migrate/20140304041718_add_remember_token_to_users.rb
+++ b/db/migrate/20140304043658_add_remember_token_to_users.rb
diff --git a/db/migrate/20140304041720_create_tournament_options.rb b/db/migrate/20140304043700_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304041720_create_tournament_options.rb
+++ b/db/migrate/20140304043700_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index eb44d71..1f844f5 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: 20140304041720) do
+ActiveRecord::Schema.define(version: 20140304043700) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"