Finish question 1 and 2
Make example work
Merge branch 'master' of https://github.com/indiesquidge/hackathon-yelp

* 'master' of https://github.com/indiesquidge/hackathon-yelp:
  Initial commit