fork from panxw.github.com
Merge branch 'master' of github.com:haidaoxiaofei/haidaoxiaofei.github.io

Conflicts:
	README.md