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

Conflicts:
	index.html
Site updated at 2013-08-07 02:06:15 UTC