initial work on lobby server
fix merge conflict
Merge pull request #1 from olivierrr/lobby-server

WIP initial work on lobby server