a作者的修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	javademo/src/main/java/org/wsr/mvn/test.txt