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

Conflicts:
	lab 1/client.html
	lab 1/client.js