tried to fix the jumping problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/CameraScript.cs
	Assets/Scripts/Script_Character.cs