Stupid Git
Merge branch 'network' of https://github.com/Bergmam/DAT255.git into network