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

Conflicts:
	index.html
Site updated at 2013-10-06 20:31:54 UTC