Working on DetectPlayer.cs
Merge branch 'master' into Detection_System

Conflicts:
	Assets/DOTween.meta
	Assets/DOTween/DOTween.dll.meta
	Assets/Plugins.meta
	Assets/Plugins/UnityVS/Editor/UnityVS.VersionSpecific.dll
	Assets/Plugins/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
	Assets/Scenes/SpyderPrototype/Bot.physicMaterial.meta
	Assets/Scenes/UliTestScene/NavMesh.asset
	Assets/Scenes/UliTestScene/NavMesh.asset.meta
	Assets/Standard Assets/Image Effects (Pro Only)/_Sources/Shaders/BlendModesOverlay.shader.meta
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
	Assets/uli_test_scene.meta
	Assets/uli_test_scene/NavMesh.asset.meta
Worked on player detection peripheral vision falloff
Merge branch 'master' into Detection_System

Conflicts:
	Assets/Plugins.meta
	Assets/Plugins/DOTween.meta
	Assets/Plugins/DOTween/DOTween.dll.meta
	Assets/Plugins/DOTween/DOTween43.dll.addon.meta
	Assets/Plugins/DOTween/DOTween43.dll.mdb.addon
	Assets/Plugins/DOTween/DOTween43.dll.mdb.addon.meta
	Assets/Plugins/DOTween/DOTween43.xml.addon
	Assets/Plugins/DOTween/DOTween46.dll.mdb.addon
	Assets/Plugins/DOTween/DOTween46.xml.addon
	Assets/Plugins/DOTween/Editor/DOTweenEditor.dll.meta
	Assets/Plugins/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll
	Assets/Plugins/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll
	Assets/Scenes/DetectionTest/DetectionTest.unity
	Assets/Scenes/Spyder.unity
spyderbot camera and control switching
gamepad controls implemented
Merge branch 'spyder_prototype_patch'