yelp_api, created get_yelp_restaurants, get_yelp_nightlife, added results#index
fixed conflict, merged with yelp branch