Octopress init
Merge branch 'master' of github.com:matthoffman/matthoffman.github.com

Conflicts:
	index.html
Site updated at 2014-01-01 08:44:19 UTC