Octopress init
Site updated at 2013-08-27 12:14:57 UTC
Merge branch 'master' of https://github.com/clockfly/clockfly.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css