Octopress init
Merge branch 'master' of https://github.com/ericpfisher/ericpfisher.github.io

Conflicts:
	index.html
Site updated at 2014-05-15 20:11:45 UTC