completed changes to client to use JSON protocol
Merge branch 'master' of github.com:vipshek/CS262