Added Show page
Merge remote-tracking branch 'origin/master2' into master2

Conflicts:
	app/controllers/users_controller.rb