resolving conflict
Merge branch 'master' of https://github.com/rooagarwal/test2.git

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