random
Merge branch 'master' of https://github.com/ShadeO89/SchoolProject

Conflicts:
	unity/Assets/Prefabs/mage_prefab/FireBall_mage.prefab
	unity/Assets/Prefabs/mage_prefab/fireball_explosion.prefab