updata
Merge branch 'master' of https://github.com/ITBox/GaoRenZhiLu

Conflicts:
	code/GaoRenZhiLu/.gitignore