Updating server.py
Merge branch 'master' of https://github.com/bjurgess1/cse491-serverz
Merge branch 'master' of https://github.com/bjurgess1/cse491-serverz
Updating changelog
Merge pull request #2 from bjurgess1/hw3

Merging hw3 with the master branch