joystick jump button
Running and Jumping
Merge branch 'master' of https://github.com/aproctor/thrillho

Conflicts:
	ProjectSettings/InputManager.asset