Erster Test mit einem Test Branch...
Merge remote-tracking branch 'origin/testBranch'

Conflicts:
	testrepostory/src/main/java/testrepostory/Test.java