set up client

set up client
Merge branch 'master' of https://github.com/BillXu/Project