"hhw3 updates to server.py"
"hw3 updates to test_server.py"
Merge pull request #4 from westjour/hw3-branch

pull changes from hw3 branch to master branch