my changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZmavenTest/src/main/java/com/test/Test.java