2

更新
Merge branch 'master' of https://github.com/zhanfang/zhanfang.github.com

Conflicts:
	images/head-logo.png
	index.html