Include cherry pick from rails
changed appearance to default view in browser and removed an unnecessary margin

Conflicts:
	app/assets/stylesheets/base.css.scss
added styling for figcaptions

Conflics:
	app/assets/stylesheets/base.css.scss