More cleanup
Merge branch 'master' of https://github.com/underdiver/Personal-Website

Conflicts:
	index.html