Octopress init
Site updated at 2014-03-08 07:24:02 UTC
Merge branch 'master' of https://github.com/Xiaohong-Deng/xiaohong-deng.github.com

Conflicts:
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
Site updated at 2014-03-08 07:40:26 UTC