hw3 changes
Changes for hw3
Merge master with my changes for hw3

Merge branch 'master' of https://github.com/ettemaet/cse491-serverz