More changes in Masterobject
Merge branch 'master' of
https://github.com/GoldiMM/Informatikprojekt.git