set up initial controller for quiz_images. 'clothing' category (test) now appears randomly distributed on /quiz_images/1. needs refectoring
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