say hello to user2
Merge branch 'master' of https://github.com/hzsunzixiang/learngit

Conflicts:
	doc/instruction.txt