changes in player pickup and inventory
Merge branch 'PickUps'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/TRex.prefab