fix issues in tournaments controller
Merge branch 'master' of github.com:LukeShu/leaguer
get changes to generate from main
run generate
Merge branch 'clean2'
make editing user permissions work