yelp api
update conflict from merge
Merge pull request #72 from toannguyenle/rails_toan

yelp api