Octopress init
Site updated at 2013-12-28 12:21:07 UTC
Merge remote-tracking branch 'origin/master'

Conflicts:
	atom.xml
	blog/2012/09/16/start/index.html
	blog/2012/09/17/alive-reading-notes/index.html
	blog/2012/09/18/travel-start/index.html
	blog/archives/index.html
	index.html
	javascripts/github.js
	javascripts/modernizr-2.0.js
	javascripts/octopress.js
	javascripts/pinboard.js
	javascripts/twitter.js
	sitemap.xml
	stylesheets/screen.css