small changes
Merge branch 'master' of https://github.com/Rameos/PSMG_Team_Zitronenkuchen
small changes
fix merge conflict