Transferring progress to my pc.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Added rotating item selection
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud

Conflicts:
	UnityProject-CyberDino/Assets/Scenes/DumbellTrack.unity
	UnityProject-CyberDino/Assets/Scripts/PickUps/PickUpItem.cs
Added I-Shun's graphics to the project files.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud

Conflicts:
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Raptor/Prefabs/Models/Materials/lambert1.mat

Implemented I-Shun's graphics into the game.
Fixed the transparence of the item textures. The hud script should now be able to be linked up with the item pick up script.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Made some small changes like adding an "almost dead" gui texture.
Napalm Working
Merge branch 'Robert_new_hud'
New Raptor with Texture, Animations, AND Rig.
Merge branch 'Diloph/Spino'
added playerPickUp class, changed structure of how item pickups are tracked in that class
Merge branch 'PickUps'

Conflicts:
	UnityProject-CyberDino/Assets/Scripts/PickUps/PickUpItem.cs
Diloph texture, animation, rig, it works!
Merge branch 'DilophAnimations'
Raptor Ragdoll and Mecanim updated with new textures and animations
Merge branch 'ragdoll'