add commit 8, after merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/zhang/zhang_hello/HelloWorld.java