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

Conflicts:
	index.html
Site updated at 2013-08-11 17:53:55 UTC