my Commit
Merge branch 'master' of
ssh://git@github.com/Simon290/PCAdministration.git

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