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

1 files changed, 1 insertions, 1 deletions

diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
index 08ae0ef..0b2bfcd 100644
--- a/app/views/matches/index.json.jbuilder
+++ b/app/views/matches/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@matches) do |match|
-  json.extract! match, :id, :tournament_id, :name
+  json.extract! match, :id, :tournament_id, :name, :winner_id
   json.url match_url(match, format: :json)
 end