Make up arrow jump.
Merge branch 'master' of https://github.com/zachanima/catbox

Conflicts:
	Player.js
	main.js