Octopress init
Site updated at 2014-05-31 21:09:35 UTC
Merge branch 'master' of github.com:joefryer/joefryer.github.io

Conflicts:
	index.html
Site updated at 2014-05-31 21:30:34 UTC