rename in user2
Merge branch 'master' of https://github.com/hzsunzixiang/learngit

Conflicts:
	Instruct.txt
	doc/instruction.txt
	instruct.txt