changed users show in users_controller so that non-users cannot view /users/id pages
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...