Fixed an end with a _form and we fixed some other erros
Merge branch 'master' of https://github.com/LukeShu/Leaguer

Conflicts:
	app/views/tournaments/_form.html.erb