Jumping!

Jump added via OnCollisionEnter/Exit functions
Merge remote-tracking branch 'origin/AlexBranch1.0' into JackBranch1.0

Conflicts:
	2DArenaFighterr/Assets/Scripts/PlayerControl.cs