hi
Merge branch 'master' of https://github.com/iwoodruff/iwoodruff.github.io

Conflicts:
	app/index.html
cleanup