Merge branch 'master' of https://github.com/Yayanos/Project-Freelance

Conflicts:
	Assets/Animations/Climb/Climb.anim.meta
	Assets/Animations/Ninja_Gaiden_RunCycle1.controller
	Assets/Animations/RunCycle/runCycle.anim
	Assets/Animations/RunCycle/runCycle.anim.meta
	Assets/Animations/runCycle.anim
	Assets/Animations/runCycle.anim.meta
	Assets/C# scripts/Lights/lightScript.cs
	Assets/C# scripts/PlayerScript.cs
	Assets/Materials/SpeedBoost.jpg
	Assets/Music/Aphex Twin - Drukqs - vordhosbn.mp3.meta
	Assets/Prefabs/PlayerTest.prefab.meta
	Assets/Prefabs/Pointer.prefab.meta
	Assets/Prefabs/enemy.prefab
	Assets/Scenes/Beta.unity
	Assets/runCycle.anim
	Assets/runCycle.anim.meta