git
ignore
block header issue
Merge branch 'refs/heads/master' into test
Merge branch 'prod' of https://github.com/ITS-UofIowa/diversity.uiowa.edu into prod

Conflicts:
	.gitignore
gitignore
removed display:none
A-Z styling
minor a-z adjustments
gitignore
a-z and blog styling
Merge branch 'refs/heads/prod' into test
Merge branch 'refs/heads/test'

Conflicts:
	themes/diversity/css/global.styles.css