Initial commit
Yelp Rails App
Merge branch 'master' of https://github.com/benhutchinson/Yelp
README UPDATE
merge conflicts resolved?