Merge branch 'master' of https://github.com/ludwigkrokstedt/TDDD24-labbserie

Conflicts:
lab 1/client.js
version 31/1 - kl 15:14