Merge pull request #12 from RossWittenberg/quiz_images

added seed data, controller, and view for category #2, tv_shows
zipcode views controller
changed search_api model to work for category filter and location
updated seed file
Merge branch 'master' of github.com:RossWittenberg/drink_finder into views
zipcodes
Merge pull request #13 from RossWittenberg/search_api

changed search_api model to work for category filter and location
bars controller
Merge pull request #15 from RossWittenberg/bars

Bars
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
views for bars_results page
Merge pull request #17 from RossWittenberg/views

views for bars_results page
Merge branch 'master' of github.com:RossWittenberg/drink_finder

Conflicts:
	search_bar_app/app/views/bars/results.html.erb
started views/bars/results. render populates with infor from search api.
changed some formatting in the bars/reseults view