Fixed bug - pressing enter would cause exit to lobby.
Deduplicated the if statements
Merge branch 'master' of https://github.com/JordanSekky/resistance into integrate