update Master and client so more easy to test
Merge branch 'master' of https://github.com/robertcao/CMPE275_Project1