Merge pull request #2 from MaxwellGBrown/hw2

hw2 - final commit
test_server.py corrections
Merge master to hw2
fixed test_server.py