login logout
adjusted quiz_image controller so that it now adds the value of the selected image to the session[:value_array]
icon css

Merge branch 'master' of github.com:RossWittenberg/drink_finder into views

Conflicts:
	search_bar_app/config/routes.rb
more refactoring of the quiz_image controller and method. filler for testing still in place.
Merge pull request #8 from RossWittenberg/views

Views
Merge branch 'master' into quiz_images

Conflicts:
	search_bar_app/config/routes.rb
Merge pull request #9 from RossWittenberg/quiz_images

Quiz images
Merge pull request #10 from RossWittenberg/search_api

added json gem to Gemfile, added methods to search_api model
made new migration to drop 'name' column from quiz_images. filepath has the same value making 'name' superfluous. i also adjusted the model and current seed file to reflect this change.
Merge pull request #11 from RossWittenberg/quiz_images

made new migration to drop 'name' column from quiz_images. filepath has ...
changed search_api model to work for category filter and location