reincorporate 2/4 player selection in lobby
Merge branch 'master' of https://github.com/pas0185/RIP

Conflicts:
	pserver.js