Octopress init
Site updated at 2014-08-17 12:39:36 UTC
Merge branch 'master' of github.com:zhaoxinyu/zhaoxinyu.github.io

Conflicts:
	atom.xml
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-08-17 12:48:43 UTC