added m1()
Merge branch 'testBranch' of https://github.com/achat/testEGit.git into
testBranch

Conflicts:
	src/ClassY.java