Finish client first version
Merge branch 'master' of https://github.com/Fuoon/Project3