deploy blog
Merge branch 'master' of github.com:liangbizhi/liangbizhi.github.io

Conflicts:
	2014/10/index.html
	2014/11/index.html
	about/index.html
	index.html
	胡思乱想/2014/10/26/hello-world.html
	胡思乱想/index.html
deploy blog