mike changing gameLobby.java
Merge remote-tracking branch 'upstream/master'