hw2 changes
Merge https://github.com/MattyAyOh/cse491-serverz into hw2

Conflicts:
	ChangeLog
	server.py