Merge branch 'master' of https://github.com/dhnelson1/TTW-Site-Redesign

Conflicts:
	about.html
conflict resolution