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

Conflicts:
	index.html
Site updated at 2013-08-09 08:22:20 UTC