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

Conflicts:
	index.html
Site updated at 2013-09-03 10:03:30 UTC