3. Nachtrag von Workspace 1
Merge remote-tracking branch 'test5a/master'

Conflicts:
	src/gitTest5/Test1.java
gitTest5
Merge remote-tracking branch 'test5a/master'

Conflicts:
	src/gitTest5/Test1.java