Octopress init
Merge branch 'master' of https://github.com/3c7/3c7.github.com

Conflicts:
	index.html
Site updated at 2013-09-25 17:10:00 UTC
Site updated at 2013-09-25 17:11:43 UTC