added yelp gem, some code in sites controller, returning json for dog_parks on root page
merging conflicts