Fixed client parsing issue
Merge branch 'master' of https://github.com/venom888/COMP2406-A2