fix client bug again
Merge branch 'master' of https://github.com/kanitw/cse550-a2