pull changes from master
make {scheduling,seeding}_method attributes of _stage, {scoring,sampling}_method attributes of tournament
run ./generate.sh
Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb
Merge branch 'master' of https://github.com/LukeShu/leaguer