hw1 code review
Merge pull request #1 from massiek/hw1-review

hw1 code review
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.py