Server mmodified
Merge branch 'master' of github.com:amaurybrisou/WebGL_Server