Commting mage fireball AGAIN!
Merge branch 'master' of https://github.com/ShadeO89/SchoolProject

Conflicts:
	unity/Assets/Prefabs/mage_prefab/mage_fireball.prefab.meta