Homework 1 Code Review

Nothing wrong with the substance, but some style/formatting issues
Merge pull request #1 from hoffm386/hw1-review

Homework 1 Code Review
trying to commit hw2 to master
removed conflict artifacts
fixed test_server.py