More server stuff
Merge branch 'master' of https://github.com/Isnah/Gruppe39