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

Conflicts:
	app/views/users/show.html.erb
Merge branch 'master' of github.com:RossWittenberg/search_bar into quiz_images

Conflicts:
	app/assets/stylesheets/application.css.erb