changed links so that you can click on your show page link when you sign in.  fixed the users controller show method so that this would work! show paths work now
merge

Merge branch 'master' into links
merged

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

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
user controller