again
resolving conflicts
:wq
:q
w

Merge branch 'dev' of github.com:scarerkite/football_hackathon into dev
adding borough sort and yelp request
and again
Merge branch 'mat' of github.com:scarerkite/football_hackathon into dev