Testing out pushing to local branch.
Switched out the turret model and made adjustments to the turret projectile
Merge branch 'Sam_Working'
Respawn and Death Trigger working.
Merge remote-tracking branch 'origin/master' into Myles_working
Transferring progress to my pc.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
New Weapon System
Added a Timed function to the Ragdoll that restores position in play
Merge branch 'Ragdoll_Timed'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Raptor.prefab
	UnityProject-CyberDino/Assets/Scripts/Dinosaurs/Player/UserControl.cs
Cleaned up and annotated the ragdoll script
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 extra turret spawning locations and deleted some empty folders
Added I-Shun's graphics to the project files.
Smite working both for single target and multiple targets.
Fields for Arc, Range, and Damage all in unity inspector for balancing.
A little bit of clean up.  Still have files incase something got removed that shouldn't have.
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.
Sticky Bomb, Smite, Flamethrower, and Sonic Scream functionally working.