ant project in testv1 branch
converting to maven in testv2
beautiful
Merge remote-tracking branch 'origin/testv2'
correcting method name
Merge remote-tracking branch 'origin/master'

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