Added lobby chatroom
Fixed merge conflict with chatroom lobby
Fixed merge conflicts
Preparing to merge with mike
Merge pull request #2 from firerml/lobby

Lobby