made some changes so desktop works
Merge branch 'tmp' into develop
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop