HW12
Merge branch 'hw12' of ssh://github.com/MattyAyOh/cse491-serverz into hw12
Fixed up issues, working on HW13