getting client changes
Merge branch 'master' of https://github.com/phonpr/cs414-mps