master commit after I had a branch
another commit of the master
Merge branch 'master' into branch1

Conflicts:
	TestProject/src/Main.java