testing out
deleting old
Merge branch 'gh-pages' of github.com:wfreeman/wfreeman.github.com

Conflicts:
	index.html