Merge
Added Yelp API to get restaurants using Yelpster gem
Fixing Merge Conflicts