my changes
Update server.py
Update test_server.py
mychanges
Merge pull request #2 from beckhamer/hw2

Hw2