changed users show in users_controller so that non-users cannot view /users/id pages
changed search_for_bar method in SearchAPI model to have a  limit of 5, returning 5 results instead of 3.
wrote methods and controllers for new quiz_image logic
Merge pull request #42 from RossWittenberg/hello_branch

changed search_for_bar method in SearchAPI model to have a  limit of 5, ...
Merge pull request #43 from RossWittenberg/new_quiz_images

wrote methods and controllers for new quiz_image logic
changes to bars and users controllers
Merge pull request #44 from RossWittenberg/hello_branch

changes to bars and users controllers
Merge pull request #45 from RossWittenberg/css

index page and results page
resolved merge conflict

Merge branch 'non-users' of github.com:RossWittenberg/search_bar into non-users

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #41 from RossWittenberg/non-users

changed users show in users_controller so that non-users cannot view /us...