Edited files
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino

Conflicts:
	UnityProject-CyberDino/Assets/Resources/GUI/CountDown.prefab.meta
	UnityProject-CyberDino/Assets/Resources/GUI/DilophNoRace.prefab.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/fireButton.mat.meta
	UnityProject-CyberDino/Assets/Resources/GUI/RaptorNoRace.prefab.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Spinosaurus_riggedNoRace.prefab.meta
	UnityProject-CyberDino/Assets/Resources/GUI/TRexNoRace.prefab.meta
	UnityProject-CyberDino/Assets/Resources/PickUps/Resources/PickUpManager.prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Bump.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Bump/Materials.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Bump/Materials/Shockwave_material.mat.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Bump/Resources.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Bump/Resources/Bump_Prefab.prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Dust Trail/Materials.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Dust Trail/Materials/Dust_Material.mat.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Materials.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Materials/Boost_Material.mat.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Materials/Materials/boost_Texture.mat.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Resources.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Resources/Boost_prefab.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser/Materials.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser/Materials/Lazer_Material.mat.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser/Resources.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser/Resources/Laser_VFX.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Materials.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Materials/MachineGunBulletGradiant_Material.mat.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Materials/MachineGunBulletTrail_Material.mat.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources/BulletHit_VFX 1.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources/Player_MachineGun_Bullet.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources/Player_MachineGun_Gun.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Materials.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Materials/smoke trail.mat.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/MissileHit_VFX.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/MissileTrail_VFX.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/PlayerMissileLauncher.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/mainSmokeTrail.prefab.meta
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/shockwave-rocket.prefab.meta