修改博客
Merge branch 'master' of github.com:daodaoliang/daodaoliang.github.com

Conflicts:
	life/index.md