resolving lock
Merge branch 'dev' of github.com:scarerkite/football_hackathon into dev
Resolving Gemlock issue
Small form changes
Syncing