Added client-server code
Merge branch 'master' of https://github.com/GREE-SC-14/project