fixin jumpin
Merge branch 'master' of https://github.com/jtmac6/gdd2game

Conflicts:
	src/js/Player.js
Jump once!
Merge branch 'master' of https://github.com/jtmac6/gdd2game

Conflicts:
	src/js/Scene.js