tvungen
Merge branch 'master' of https://github.com/PHjalmars/TDDD24/

Conflicts:
	Labb2/server.py