Update naming convention
Update tests to reflect change in server.py
Merge pull request #4 from phammin1/hw2

Hw2 update with new naming convention