editted show_html
Merge branch 'master' of github.com:MensEtManus/Pinteresting

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