most recent changes
final
Merge branch 'gh-pages' of https://github.com/areynolds93/micagraphicdesign.org into gh-pages

Conflicts:
	css/main1.css