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

Conflicts:
	index.html
Site updated at 2014-05-22 05:26:59 UTC