Scaffolded Team to create models, controllers etc.
added yelp gem
fixed conflicts in gem file
map.js file and initial layout
Created table and uploaded CSV data
updated yelp.rb
resolving lock
Merge branch 'dev' of github.com:scarerkite/football_hackathon into dev
Resolving Gemlock issue
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
Small form changes
Syncing
got maps working
Updated
Merge branch 'forms' into dev
Trying to get coordinates for citymapper
bit of styling
Got directions to Citymapper working