joystick jump button
Merge pull request #1 from aproctor/master

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

Conflicts:
	ProjectSettings/InputManager.asset
derpyderpymikesucks
yella
yolo
Merge pull request #2 from aproctor/master

Sync
Merge pull request #8 from aproctor/camera_movement

Camera movement
Merge pull request #3 from aproctor/master

Sync
no message
Merge pull request #7 from tylerhebenton/master

mike sucks
Merge branch 'master' into camera_movement