Commit PC1 zu langsam
Commit PC1 anderer Branch
Commit PC1 anderer Branch
Merge remote-tracking branch 'origin/neuerBranch'
Merge branch 'master' of
ssh://git@github.com/Simon290/PCAdministration.git

Conflicts:
	PCAdministration/src/main/java/TestClass.java