Added "Failed to load prop" error message
Merge branch 'master' of https://github.com/Thegmk13/Shaarp

Conflicts:
	Assets/Animations/Player/Attack_Back.anim
	Assets/Animations/Player/Attack_Back_2.anim
	Assets/Animations/Player/Death_Back.anim
	Assets/Animations/Player/Hit_Back.anim
	Assets/Animations/Player/Idle_Back.anim
	Assets/Animations/Player/Main_Attack.anim
	Assets/Animations/Player/Main_Attack_2.anim
	Assets/Animations/Player/Main_Death.anim
	Assets/Animations/Player/Main_Hit.anim
	Assets/Animations/Player/Player_Spawn.anim
	Assets/Animations/Player/Run_Back.anim
	Assets/Animations/Player/Victory.anim