Increase max players to 2
Merge branch 'master' of https://github.com/RebootJeff/phone-tag

Conflicts:
	config/socket/socket.js
Fix powerUp management (mostly for respawn)