Gettin merge
Merge branch 'master' of github.com:Naillik1/cs3307
Client logic finished
Merge branch 'master' of github.com:Naillik1/cs3307