Commit my new changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	FooRepoProj/src/testFile1.java