homework 2 changes
Merge branch 'master' of https://github.com/mannin92/cse491-serverz into hw2

Conflicts:
	server.py
Merge pull request #2 from mannin92/hw2

homework 2 changes