hey
Merge branch 'master' of github.com:peterandclay/pixel-casino

Conflicts:
	bin/main.js
	src/game.js
	src/player.js
changed player to set dx to 0 each frame