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

Conflicts:
	Labb2/server.py
hej hej
Merge branch 'master' of https://github.com/PHjalmars/TDDD24/

Conflicts:
	Labb2/server.py
	Labb2/server.pyc
allt