made controllers and routes for bars -- search controller returns JSON data from Search API
Merge branch 'master' into bars

Conflicts:
	search_bar_app/app/models/search_api.rb
Merge branch 'bars'
Merge branch 'master' of github.com:RossWittenberg/drink_finder
Merge branch 'master' of github.com:RossWittenberg/drink_finder

Conflicts:
	search_bar_app/app/views/bars/results.html.erb