initial commit
Merge branch 'master' of https://github.com/Goulao/CollaborationServer.git
 blablablba
Merge pull request #1 from UFOMelkor/master

initial commit