Octopress init
Site updated at 2014-11-28 05:41:45 UTC
Merge remote-tracking branch 'origin/master'

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