Merge branch 'master' into rps
preGame service returns obj for roomName instead of a whole another function
when user1 disconnects, user2 becomes user1 server side
cleaned up disconnect function server side
vars in Game service --> gameObj
displays only 'status' for socket emit, instead of 3 different ones
added hotkeys to beat
Merge branch 'rps'