Merge branch 'master' of https://github.com/twhite96/minimalwebpittsburgh

Conflicts:
	main-pages/html/About.html
Merge branch 'master' of https://github.com/twhite96/minimalwebpittsburgh

Conflicts:
	About.html
	main-pages/About.html
	main-pages/html/About.html