fixed nosetest errors
Merge branch 'hw4' of https://github.com/jonest31/cse491-serverz into hw4