css changes
heroku img tag
Merge remote-tracking branch 'origin/css'

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