nothing
Merge branch 'master' of https://github.com/davidmferris/football-app
Merge branch 'master' of https://github.com/davidmferris/football-app
updated schema and dropped unnecessary tables
fixed merge conflicts