Hesp Sonic Scream fix and Ragdoll process updates.
Trex Updates
Merge branch 'Lucas's'
Trodon EMP Blast plus lightning
Merge branch 'Michael'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Troodon.prefab
Fixed a null reference error being thrown by the TurretProjectile script.
updates Trex
Spino buzz saw fix
Merge branch 'SpinoBuzzSaw'
Ai... and stuff...
Mad Dash Update
Merge branch 'Lucas''
Merge branch 'master' into master02

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Troodon.prefab
	UnityProject-CyberDino/Assets/SimpleParticlePack/Materials/Flame01.mat
Troodon/Premenu Fixes
Fixed Hesp scale
Merge branch 'HespScale'

Conflicts:
	UnityProject-CyberDino/Assets/Scenes/PreMenu.unity
Added Trodon lightning effect to each individual dino prefab
Merge branch 'Michael'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Diloph.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Hesp.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Raptor.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Spino.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/TRex.prefab
	UnityProject-CyberDino/Assets/Resources/VFX/Trodon_Lightning_VFX/Prefab/Trodon_Lightning.prefab
Merge branch 'Sam_master'
Fixed ai dinos inventory updating gui