knuuff
Merge branch 'master' of https://github.com/Patah93/NyRav

Conflicts:
	Assets/_Scripts/JumpingMan.cs