this is the client
Merge branch 'master' of https://github.com/sushiowns/cloudcomp2