generate.sh: add discussed changes
run ./generate.sh
Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/match.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/match.rb