Add lobby
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from william-alexander/master

Add lobby