a hero gotham deserves
Merge branch 'master' of https://github.com/VCUarts/social-practice

Conflicts:
	library/css/style.css
	library/images/valentine.jpg
	library/scss/chunks/_header.scss