EclipseWkspc edited new2.txt
Merge branch 'master' of https://github.com/mike-gill/maven-git-test.git

Conflicts:
	new2.txt