knuuff
Merge branch 'Jessica' into Patrik

Conflicts:
	Assets/_Scripts/JumpingMan.cs