Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into PickUps
no message
Added most of the code for weapon switching, just need to integrate with the gui
Merge branch 'PickUps'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Environment/Resources/Destructible Object.prefab.meta
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Materials/Materials.meta~HEAD.meta
	UnityProject-CyberDino/Assets/Scenes/DumbellTrack.unity
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino

Conflicts:
	UnityProject-CyberDino/Assets/Scenes/DumbellTrack.unity