more client integration
Merge branch 'master' of https://github.com/alexsapps/cse125.git