pokemon
Merge branch 'master' of https://github.com/FruitieX/multiplayer
Merge branch 'master' of https://github.com/FruitieX/multiplayer

Conflicts:
	multiplayer.js
disable socket.io debug and fix keycode/data messup