lets get this working on arctic
Merge remote-tracking branch 'origin/hw7' into hw7

Conflicts:
	server.py