spec files - bar quizimg user zipcode
new branch views

Merge branch 'master' of github.com:RossWittenberg/drink_finder into views
routes
Merge pull request #6 from RossWittenberg/views

Views
merging quiz_images controllers and views with master branch

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

Conflicts:
	search_bar_app/app/controllers/application_controller.rb
	search_bar_app/app/views/quizimages/imgpagefour.html.erb
	search_bar_app/app/views/quizimages/imgpageone.html.erb
	search_bar_app/app/views/quizimages/imgpagethree.html.erb
	search_bar_app/app/views/quizimages/imgpagetwo.html.erb
	search_bar_app/config/routes.rb
adjusted quiz_image controller so that it now adds the value of the selected image to the session[:value_array]