Hopeful style for pages I cannot see on localhost.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/show.html.erb