fix all
Merge branch 'master' of https://github.com/testTeam9/someJavaProject1

Conflicts:
	src/org/somepkg/test1/SomeClassM.java