Octopress init
Site updated at 2013-09-25 13:09:42 UTC
Site updated at 2013-09-25 13:12:55 UTC
Merge branch 'master' of https://github.com/3c7/3c7.github.com

Conflicts:
	atom.xml
	blog/index.html
	categories/blog/atom.xml
	categories/thoughts/atom.xml
	index.html
	sitemap.xml
	stylesheets/screen.css
	the-new-home/index.html
Site updated at 2013-09-25 13:15:53 UTC