Revert "Revert "derp""

This reverts commit c3c53a37a87c6a4e63df1a5795b23d504e78595c.
reset 2
Merge branch 'master' of https://github.com/petergoodrich/petergoodrich.github.io

Conflicts:
	README.md
	index.html