update
Merge branch 'master' of github.com:tangzhenquan/tangzhenquan.github.com

Conflicts:
	README.md
update