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

Conflicts:
	atom.xml
	blog/2013/11/03/xiaohongdengs-fisrt-octopress-blog/index.html
	blog/archives/index.html
	blog/categories/cs/atom.xml
	blog/categories/mooc/atom.xml
	blog/categories/octopress/atom.xml
	index.html