server refactor
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git