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

Conflicts:
	index.html
Site updated at 2014-09-15 23:44:34 UTC