test2
Merge branch 'master' of https://github.com/ngmip/TestGit.git

Conflicts:
	src/main/java/com/marketip/test/Test2.java