Octopress init
Site updated at 2014-05-04 10:06:08 UTC
Site updated at 2014-05-04 10:08:18 UTC
Merge branch 'master' of github.com:yanyichao/yanyichao.github.com

Conflicts:
	atom.xml
	sitemap.xml
	stylesheets/screen.css