Merge branch 'master' of https://github.com/rikkiloades/football-tracker
Merge branch 'master' into gh-pages