Use phaser states
Merge branch 'master' into develop

Conflicts:
	index.html
	scripts/main.js
	scripts/player.js
Double jump