foo
fix bugs
Merge branch 'master' of https://github.com/LukeShu/leaguer
Tournament advancement stuff. IT'S 4 AM
Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/controllers/matches_controller.rb
	app/views/matches/show.html.erb