Major catchup
catchup
Merge branch 'hw8' of https://github.com/DuncanCYoung/cse491-serverz into hw8