tournaments: fix game selection
add a stop.sh script
add a user_tournament_pair
Merge branch 'clean'
implement tournament joining
routes: make server a single resource
Merge branch 'master' of github.com:LukeShu/leaguer

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/tournament.rb
	app/views/tournaments/_selected.html.erb
	app/views/tournaments/new.html.erb
	db/migrate/20140306024707_create_servers.rb
	db/migrate/20140306024711_create_matches.rb
	db/migrate/20140306024713_create_teams.rb
	db/migrate/20140306024715_create_alerts.rb
	db/migrate/20140306024718_create_pms.rb
	db/migrate/20140306024722_create_users.rb
	db/migrate/20140306024724_create_sessions.rb
	db/migrate/20140306024729_create_server_settings.rb
	db/migrate/20140306024731_create_user_team_pairs.rb
	db/migrate/20140306024733_create_team_match_pairs.rb
	db/migrate/20140306024735_create_tournament_options.rb
	db/migrate/20140306024744_add_hidden_attrs_to_user.rb
	db/migrate/20140306202154_create_servers.rb
	db/migrate/20140306202156_create_tournaments.rb
	db/migrate/20140306202158_create_matches.rb
	db/migrate/20140306202200_create_teams.rb
	db/migrate/20140306202202_create_alerts.rb
	db/migrate/20140306202204_create_pms.rb
	db/migrate/20140306202207_create_games.rb
	db/migrate/20140306202209_create_users.rb
	db/migrate/20140306202211_create_sessions.rb
	db/migrate/20140306202213_create_game_attributes.rb
	db/migrate/20140306202215_create_server_settings.rb
	db/migrate/20140306202217_create_tournament_options.rb
	db/migrate/20140306202219_create_user_team_pairs.rb
	db/migrate/20140306202224_create_team_match_pairs.rb
	db/migrate/20140306202232_add_hidden_attrs_to_user.rb
	db/migrate/20140306222309_create_servers.rb
	db/migrate/20140306222320_create_matches.rb
	db/migrate/20140306222325_create_teams.rb
	db/migrate/20140306222330_create_alerts.rb
	db/migrate/20140306222336_create_pms.rb
	db/migrate/20140306222347_create_users.rb
	db/migrate/20140306222352_create_sessions.rb
	db/migrate/20140306222357_create_server_settings.rb
	db/migrate/20140306222402_create_tournament_options.rb
	db/migrate/20140306222422_create_user_team_pairs.rb
	db/migrate/20140306222427_create_team_match_pairs.rb
	db/migrate/20140306222447_add_hidden_attrs_to_user.rb
	db/schema.rb
	generate.sh
Merge branch 'clean'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/teams/show.html.erb
	app/views/tournaments/index.html.erb
	config/routes.rb
Merge branch 'clean' into master2

Conflicts:
	config/routes.rb
Merge branch 'master2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/tournament.rb
	app/views/tournaments/_selected.html.erb
	app/views/tournaments/new.html.erb
	config/routes.rb