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

Conflicts:
	lab2/server.py