Finish Hackathon
Merge branch 'master' of https://github.com/indiesquidge/hackathon-yelp

* 'master' of https://github.com/indiesquidge/hackathon-yelp:
  Finish Hackathon