Fix merge
Merge branch 'master' of https://github.com/frankieleef/football-api
Added user roles logic