yelp_api, created get_yelp_restaurants, get_yelp_nightlife, added results#index
fixed conflict, merged with yelp branch
fixed merge conflic on gemfile.lock
revert date input back to text_field
changed input date to date_select(calendar drop down)
added results controller, results_index page, and listed yelp results in index page
fixed gemfile.lock
Merge branch 'results-page'
added method to display_time and display_date, edited the results page
Merge branch 'results-page'
4square prints on page