Merge branch 'master' of https://github.com/ettemaet/cse491-serverz
hw12
Final homework completed/50 points done
forgot to update ChangeLog
Merge branch 'master' of https://github.com/ettemaet/cse491-serverz