New players
Merge branch 'master' of github.com:Jigarsolanki/i-mario

Conflicts:
	public/src/game.js