Merge branch 'clean'

Conflicts:
	app/models/match.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043624_create_teams.rb
	db/migrate/20140304043626_create_alerts.rb
	db/migrate/20140304043629_create_pms.rb
	db/migrate/20140304043633_create_users.rb
	db/migrate/20140304043637_create_server_settings.rb
	db/migrate/20140304043700_create_tournament_options.rb
	db/migrate/20140307045916_create_servers.rb
	db/migrate/20140307045922_create_matches.rb
	db/migrate/20140307045927_create_teams.rb
	db/migrate/20140307045934_create_alerts.rb
	db/migrate/20140307045941_create_pms.rb
	db/migrate/20140307050001_create_users.rb
	db/migrate/20140307050016_create_server_settings.rb
	db/migrate/20140307050023_create_tournament_options.rb
	db/migrate/20140307051752_create_servers.rb
	db/migrate/20140307051756_create_tournaments.rb
	db/migrate/20140307051800_create_matches.rb
	db/migrate/20140307051804_create_teams.rb
	db/migrate/20140307051808_create_alerts.rb
	db/migrate/20140307051812_create_pms.rb
	db/migrate/20140307051816_create_games.rb
	db/migrate/20140307051820_create_users.rb
	db/migrate/20140307051824_create_game_attributes.rb
	db/migrate/20140307051827_create_server_settings.rb
	db/migrate/20140307051831_create_user_team_pairs.rb
	db/migrate/20140307051835_create_team_match_pairs.rb
	db/migrate/20140307051853_add_index_to_users_email.rb
	db/migrate/20140307051857_add_index_to_users_user_name.rb
	db/migrate/20140307051901_add_password_digest_to_users.rb
	db/migrate/20140307051904_add_remember_token_to_users.rb
	db/migrate/20140307051908_create_tournament_options.rb
	db/schema.rb
	generate.sh

18 files changed, 1 insertions, 0 deletions

diff --git a/db/migrate/20140307045916_create_servers.rb b/db/migrate/20140307052327_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140307045916_create_servers.rb
+++ b/db/migrate/20140307052327_create_servers.rb
diff --git a/db/migrate/20140307045922_create_matches.rb b/db/migrate/20140307052331_create_matches.rb
index 325863d..67a5b7b 100644
--- a/db/migrate/20140307045922_create_matches.rb
+++ b/db/migrate/20140307052331_create_matches.rb
@@ -3,6 +3,7 @@ class CreateMatches < ActiveRecord::Migration
     create_table :matches do |t|
       t.references :tournament, index: true
       t.string :name
+      t.references :winner, index: true
 
       t.timestamps
     end
diff --git a/db/migrate/20140307045927_create_teams.rb b/db/migrate/20140307052334_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140307045927_create_teams.rb
+++ b/db/migrate/20140307052334_create_teams.rb
diff --git a/db/migrate/20140307045934_create_alerts.rb b/db/migrate/20140307052338_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140307045934_create_alerts.rb
+++ b/db/migrate/20140307052338_create_alerts.rb
diff --git a/db/migrate/20140307045941_create_pms.rb b/db/migrate/20140307052342_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140307045941_create_pms.rb
+++ b/db/migrate/20140307052342_create_pms.rb
diff --git a/db/migrate/20140307045948_create_tournaments.rb b/db/migrate/20140307052346_create_tournaments.rb
index 545e603..545e603 100644
--- a/db/migrate/20140307045948_create_tournaments.rb
+++ b/db/migrate/20140307052346_create_tournaments.rb
diff --git a/db/migrate/20140307045954_create_games.rb b/db/migrate/20140307052350_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140307045954_create_games.rb
+++ b/db/migrate/20140307052350_create_games.rb
diff --git a/db/migrate/20140307050001_create_users.rb b/db/migrate/20140307052354_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140307050001_create_users.rb
+++ b/db/migrate/20140307052354_create_users.rb
diff --git a/db/migrate/20140307050008_create_sessions.rb b/db/migrate/20140307052358_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140307050008_create_sessions.rb
+++ b/db/migrate/20140307052358_create_sessions.rb
diff --git a/db/migrate/20140307050016_create_server_settings.rb b/db/migrate/20140307052402_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140307050016_create_server_settings.rb
+++ b/db/migrate/20140307052402_create_server_settings.rb
diff --git a/db/migrate/20140307050023_create_tournament_options.rb b/db/migrate/20140307052405_create_tournament_options.rb
index 53b601c..53b601c 100644
--- a/db/migrate/20140307050023_create_tournament_options.rb
+++ b/db/migrate/20140307052405_create_tournament_options.rb
diff --git a/db/migrate/20140307050029_create_game_options.rb b/db/migrate/20140307052409_create_game_options.rb
index 2f62ef7..2f62ef7 100644
--- a/db/migrate/20140307050029_create_game_options.rb
+++ b/db/migrate/20140307052409_create_game_options.rb
diff --git a/db/migrate/20140307050035_create_scores.rb b/db/migrate/20140307052413_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140307050035_create_scores.rb
+++ b/db/migrate/20140307052413_create_scores.rb
diff --git a/db/migrate/20140307050041_create_tournament_players_join_table.rb b/db/migrate/20140307052417_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140307050041_create_tournament_players_join_table.rb
+++ b/db/migrate/20140307052417_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140307050046_create_tournament_hosts_join_table.rb b/db/migrate/20140307052421_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140307050046_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140307052421_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140307050052_create_team_user_join_table.rb b/db/migrate/20140307052424_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140307050052_create_team_user_join_table.rb
+++ b/db/migrate/20140307052424_create_team_user_join_table.rb
diff --git a/db/migrate/20140307050059_create_match_team_join_table.rb b/db/migrate/20140307052428_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140307050059_create_match_team_join_table.rb
+++ b/db/migrate/20140307052428_create_match_team_join_table.rb
diff --git a/db/migrate/20140307050124_add_hidden_attrs_to_user.rb b/db/migrate/20140307052443_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140307050124_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140307052443_add_hidden_attrs_to_user.rb