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

Conflicts:
	index.html
Site updated at 2013-08-27 11:51:01 UTC