modified controller and model for quiz_iamge
Merge branch 'master' of github.com:RossWittenberg/search_bar into quiz_images

Conflicts:
	app/assets/stylesheets/application.css.erb
Merge pull request #28 from RossWittenberg/quiz_images

Quiz images
Merge branch 'users_controller'
merge coflicts fixed