changed users show in users_controller so that non-users cannot view /users/id pages
changes to bars and users controllers
Merge pull request #44 from RossWittenberg/hello_branch

changes to bars and users controllers
index page and results page
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...
merge

Merge branch 'master' of github.com:RossWittenberg/search_bar into new_quiz_images