update
Merge branch 'dev' of github.com:scarerkite/football_hackathon into dev
final changes