Implemented some of the lobby
Merge branch 'master' of github.com:ShmyQ/term-project