Ændringer af GiantSwitch

Mindre rettelser af kode
Revert "Ændringer af GiantSwitch"

This reverts commit aabc092235cbeacd9b530cce2bb5d8fe58bf5a15.
Fixed merge conflict in GiantSwitch
Merge branch 'master' of https://github.com/Distribuerede-systemer/server