Late commit
Merge branch 'master' of https://github.com/shawnphoffman/shawnphoffman.com

Conflicts:
	index.php