Merge case
Merge branch 'FirstBranch' into SecondBranch

Conflicts:
	GitTestPr1/src/de/vl/git/second/GitTestMain.java