updated for hw3
Merge https://github.com/DuncanCYoung/cse491-serverz into hw3