Octopress init
Merge branch 'master' of https://github.com/dingzhihu/dingzhihu.github.io

Conflicts:
	index.html
Site updated at 2014-07-24 11:06:54 UTC