cloned modified client
Merge branch 'lab05lee' into lab05