Add force when not grounded.
Added capsule collider.
Added RequiredComponent().
Fixed merge script error comments.... again.
Jump changes; added new variables.
Jump changes; added new variables\\\\\\\\.
Added OnCollisionExit().
Placed movement lines inside 'if grounded' statement.
Small changes.
Small changes.
Moved collision code to OnCollisionStay() function.
Changed instance var.
Changed velocityJump back to sqrt.
Added in the track mesh and it's colliders.
Adding in the individual collider prfabs.
Put in the scripts for the pickup system and renamed an old script.
Adjusted the pickup scripts to work in game.
Merge remote-tracking branch 'origin/rigidbody'

Conflicts:
	UnityProject-CyberDino/Assets/Scenes/CityTrack.unity
	UnityProject-CyberDino/Assets/Scripts/Dinosaurs/Motion/MotionControl.cs
	UnityProject-CyberDino/UnityProject-CyberDino.userprefs