updated vfx materials
Merge branch 'Michael'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/LucasWeapons.meta~HEAD.meta
	UnityProject-CyberDino/Assets/Resources/LucasWeapons.meta~PickUps.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Material.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Material/StartCore.mat.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Prefab/EpicSonicScream.prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/FlameThrower.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/FlameThrower/Prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/FlameThrower/Prefab/fireBreath.prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/MadDash.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/MadDash/Prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/MadDash/Prefab/MadDash.prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Materials.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Materials/saliva2.mat.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Prefab/TeleSlam.prefab.meta
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud