Add foo10
Merge branch 'master' into newBranch

Conflicts:
	TestGit/src/package1/HelloWorld.java