Single jump logic
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project1/Assets/Scripts/Character Controller/CharacterController.cs
Fix up broken stuff after merge
Merge branch 'master' of github.com:andreiagaita/PersonalSpaceInvader