JUMPING FIXED NERDS
Merge remote-tracking branch 'origin/player' into player_climbing

Conflicts:
	Unity/Assets/Scripts/Player/Player_Movement.cs