blog styling
base changes
Merge branch 'master' of https://github.com/ITS-UofIowa/diversity.uiowa.edu

Conflicts:
	themes/diversity/css/global.styles.css
Merge branch 'refs/heads/master' into test