new changes in old branch
Merge branch 'old'

Conflicts:
	codePractice/Xihui.CodePractice/src/xihui/codepractice/HelloMaster.java
change 2 in old branch
Merge branch 'old'

Conflicts:
	codePractice/Xihui.CodePractice/src/xihui/codepractice/HelloMaster.java