Updated between Robert's, Sam's, and my scripts.

- Multiplayer works in this version.  Single player is broken due to the
change in how information is stored between scenes.  Can access single
player by running a multiplayer game as host by yourself.
- Some aspects work on either pc or tablet.  I might have broken
something but the dino select doesn't work on pc but it does on the
tablet.  The tablet also has some issues transitioning into the game,
doesn't always remove the menu ui.
- You can load different dinos and control them.  Controls are pc only,
believe I broke something there but the tablet can select different
dinos and load the different types accurately.
- Position of racers is synced.  The dino animations are not.  Due to
the use of mecanim I have to run RPCs to get the animations to sync up.
Network views can observe animation components but not the animator
controller component mecanim uses.

Just a warning, I played with a lot of different scripts to get this
working.  Haven't looked at syncing VFX yet and since we're still on
transform version of the motion controller it still has some issues
going up and down slopes.  Hopefully John can get his rigid body
controller working.
Quick Fix - PC Dino Browse

Just a way to get some options for browsing dinos on pc...
Updated Folder Structure
I did some error checking for the train scripts and also I move the menu graphics into the resource folder.
Network Animations for Diloph
Added dino model spin
added scene with both ragdoll & anims for Lee
Added dino prefabs that will be put into the menu.
Tweaked the dino selection.
Adding in some ignores.
Trying to resolve meta file conflicts.
test commit
Merge remote-tracking branch 'origin/elan'
Merge remote-tracking branch 'origin/File_Organization'

Conflicts:
	.gitignore
	UnityProject-CyberDino/Assets/Resources/Respawn Checkpoints/Resources/RespawnCheckpoints.prefab
	UnityProject-CyberDino/Assets/Scenes/CityTrack.unity
	UnityProject-CyberDino/Assets/Scenes/VFX_Test_Scene.unity
	UnityProject-CyberDino/Assets/Scripts/Dinosaurs/Motion/MotionControl.cs
	UnityProject-CyberDino/Assets/Scripts/Dinosaurs/Player/UserControl.cs
	UnityProject-CyberDino/Assets/Scripts/GUI/JumpButton.cs
	UnityProject-CyberDino/Assets/Scripts/VFX/BumpEffectClass.cs
	UnityProject-CyberDino/Assets/Scripts/VFX/BumpEffectClass.cs.meta
	UnityProject-CyberDino/Assets/Scripts/VFX/RacerBumpClass.cs
	UnityProject-CyberDino/Assets/Scripts/VFX/RacerBumpClass.cs.meta
	UnityProject-CyberDino/Assets/Scripts/Weapons/Old/OldProjectileMG.cs
	UnityProject-CyberDino/Assets/Scripts/Weapons/ProjectileMachineGunClass.cs
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Old/Scripts/BumpEffectClass.cs
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Old/Scripts/BumpEffectClass.cs.meta
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Old/Scripts/RacerBumpClass.cs
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Old/Scripts/RacerBumpClass.cs.meta
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Scripts.meta
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Scripts/BumpEffectClass.cs
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Scripts/BumpEffectClass.cs.meta
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Scripts/RacerBumpClass.cs
	UnityProject-CyberDino/Assets/VFX/Effects/Bump/Scripts/RacerBumpClass.cs.meta
	UnityProject-CyberDino/Assets/VFX/Racer/Scripts/Motion/MotionClass.cs
	UnityProject-CyberDino/ProjectSettings/EditorBuildSettings.asset
Merge remote-tracking branch 'origin/RobertReed'

Conflicts:
	.gitignore
	UnityProject-CyberDino/Assets/GUI/Race and GUI scripts/MenuControl.cs~
	UnityProject-CyberDino/Assets/GUI/menu graphics.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/BackButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/BackButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/BlackBKGD.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/BlackBKGD.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/BodyArmor1.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/BodyArmor1.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/BodyArmorTab.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/BodyArmorTab.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/CityTrackGFX.png
	UnityProject-CyberDino/Assets/GUI/menu graphics/CityTrackGFX.png.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/Continue.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/Continue.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/DilophosaurusSelect.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/DilophosaurusSelect.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/DinoSelectButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/DinoSelectButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/DinoTab.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/DinoTab.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/ExitGameButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/ExitGameButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/GoToMenu.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/GoToMenu.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/HesperonychusSelect.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/HesperonychusSelect.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/HostGameButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/HostGameButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/JoinGameButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/JoinGameButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/LegArmor1.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/LegArmor1.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/LegArmorTab.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/LegArmorTab.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/LevelSelectButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/LevelSelectButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/Materials.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/Materials/fireButton.mat
	UnityProject-CyberDino/Assets/GUI/menu graphics/Materials/fireButton.mat.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/MultiPlayerButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/MultiPlayerButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/OptionsButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/OptionsButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/Pause.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/Pause.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/PlayButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/PlayButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/SinglePlayerButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/SinglePlayerButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/SpinosaurusSelect.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/SpinosaurusSelect.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/TroodonSelect.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/TroodonSelect.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/Tyrannosaurus.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/Tyrannosaurus.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/VelociraptorSelect.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/VelociraptorSelect.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/Weapon1.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/Weapon1.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/WeaponsTab.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/WeaponsTab.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/arrowLeft.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/arrowLeft.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/arrowRight.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/arrowRight.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDown1.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDown1.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDown2.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDown2.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDown3.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDown3.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDownGo!.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/countDownGo!.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/fireButton.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/fireButton.psd.meta
	UnityProject-CyberDino/Assets/GUI/menu graphics/uvuGraphic.psd
	UnityProject-CyberDino/Assets/GUI/menu graphics/uvuGraphic.psd.meta
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Hesp/Prefabs/Models/Materials.meta
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Prefabs/Individual Dinos.meta
	UnityProject-CyberDino/Assets/Prefab/MasterMenu.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BackButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BackButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BlackBKGD.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BlackBKGD.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BodyArmor1.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BodyArmor1.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BodyArmorTab.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/BodyArmorTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/CityTrackGFX.png
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/CityTrackGFX.png.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Continue.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Continue.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/DilophosaurusSelect.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/DilophosaurusSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/DinoSelectButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/DinoSelectButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/DinoTab.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/DinoTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/ExitGameButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/ExitGameButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/GoToMenu.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/GoToMenu.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/HesperonychusSelect.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/HesperonychusSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/HostGameButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/HostGameButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/JoinGameButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/JoinGameButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/LegArmor1.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/LegArmor1.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/LegArmorTab.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/LegArmorTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/LevelSelectButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/LevelSelectButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/MultiPlayerButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/MultiPlayerButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/OptionsButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/OptionsButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Pause.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Pause.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/PlayButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/PlayButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/SinglePlayerButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/SinglePlayerButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/SpinosaurusSelect.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/SpinosaurusSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/TroodonSelect.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/TroodonSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Tyrannosaurus.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Tyrannosaurus.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/VelociraptorSelect.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/VelociraptorSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Weapon1.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Weapon1.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/WeaponsTab.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/WeaponsTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/arrowLeft.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/arrowLeft.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/arrowRight.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/arrowRight.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDown1.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDown1.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDown2.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDown2.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDown3.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDown3.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDownGo!.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/countDownGo!.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/fireButton.mat
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/fireButton.mat.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/fireButton.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/fireButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/uvuGraphic.psd
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/uvuGraphic.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/BackButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/BackButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/BlackBKGD.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/BlackBKGD.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/BodyArmor1.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/BodyArmor1.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/BodyArmorTab.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/BodyArmorTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/CityTrackGFX.png
	UnityProject-CyberDino/Assets/Resources/menu graphics/CityTrackGFX.png.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/Continue.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/Continue.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/DilophosaurusSelect.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/DilophosaurusSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/DinoSelectButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/DinoSelectButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/DinoTab.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/DinoTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/ExitGameButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/ExitGameButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/GoToMenu.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/GoToMenu.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/HesperonychusSelect.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/HesperonychusSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/HostGameButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/HostGameButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/JoinGameButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/JoinGameButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/LegArmor1.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/LegArmor1.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/LegArmorTab.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/LegArmorTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/LevelSelectButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/LevelSelectButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/Materials.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/Materials/fireButton.mat
	UnityProject-CyberDino/Assets/Resources/menu graphics/Materials/fireButton.mat.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/MultiPlayerButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/MultiPlayerButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/OptionsButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/OptionsButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/Pause.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/Pause.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/PlayButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/PlayButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/SinglePlayerButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/SinglePlayerButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/SpinosaurusSelect.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/SpinosaurusSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/TroodonSelect.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/TroodonSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/Tyrannosaurus.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/Tyrannosaurus.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/VelociraptorSelect.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/VelociraptorSelect.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/Weapon1.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/Weapon1.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/WeaponsTab.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/WeaponsTab.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/arrowLeft.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/arrowLeft.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/arrowRight.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/arrowRight.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDown1.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDown1.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDown2.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDown2.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDown3.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDown3.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDownGo!.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/countDownGo!.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/fireButton.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/fireButton.psd.meta
	UnityProject-CyberDino/Assets/Resources/menu graphics/uvuGraphic.psd
	UnityProject-CyberDino/Assets/Resources/menu graphics/uvuGraphic.psd.meta
	UnityProject-CyberDino/Assets/Scenes/CityTrack.unity
	UnityProject-CyberDino/Assets/Scenes/PreMenu.unity
	UnityProject-CyberDino/Assets/Scripts/GUI/MoveButtonsScript.cs
	UnityProject-CyberDino/Assets/Scripts/GUI/MoveButtonsScript.cs.meta
Fixed merged script errors. Updated meta files.
fixed errors and deleted unused resources and duplicates.
Merge commit '34c9b1f5911d3ba5ce413cc4e27a31fb73ab3637'

Conflicts:
	UnityProject-CyberDino/Assembly-CSharp-vs.csproj
	UnityProject-CyberDino/Assembly-CSharp.csproj
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Prefabs/Individual Dinos/Player_Instantiating_Dinos.prefab.meta
	UnityProject-CyberDino/Assets/Scripts/Dinosaurs/Motion/MotionControl.cs
	UnityProject-CyberDino/Assets/Scripts/GUI/MenuControl.cs
	UnityProject-CyberDino/Library/CurrentLayout.dwlt
	UnityProject-CyberDino/Library/InspectorExpandedItems.asset
	UnityProject-CyberDino/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityProject-CyberDino/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityProject-CyberDino/Library/ScriptAssemblies/Assembly-UnityScript.dll
	UnityProject-CyberDino/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	UnityProject-CyberDino/Library/assetDatabase3
	UnityProject-CyberDino/Library/expandedItems
	UnityProject-CyberDino/Library/guidmapper
	UnityProject-CyberDino/Library/metadata/90/90c18ebbb58b043838fbdeb8fbdf88ef
	UnityProject-CyberDino/Library/metadata/b9/b98ca4a4bd0dd5040951be6d21a1a55b
	UnityProject-CyberDino/Library/metadata/f9/f99f142fc7c758d46b9d19b20e7dee8f
	UnityProject-CyberDino/Library/metadata/f9/f9cd5d6b739287443973e3770477dc1f
Fixed errors created by merging in MotionControl and MenuControl
Pulled the recent master branch commits into my new branch.