Octopress init
Site updated at 2014-01-21 14:31:00 UTC
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	atom.xml
	index.html
	robots.txt
	sitemap.xml
	stylesheets/screen.css