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
Making waypoint changes
Saving scene ugh
Merge branch 'master' into waypoints
Enabled multiple waypoints per enemy object in scene.
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
Merge branch 'spyder_prototype_patch'
Adding more stuff to gitignore
hopefully gitignore will now work
Cleaning up master
Still more cleanup
Fixed bug with detecting player while moving
Merge branch 'Detection_System'
Fixed Player prefab
- Added "new" keyword to resolve camera warnings in Bot and BotCamera
Implementing first version of enemy state
Force adding Isra object file
Merge branch 'enemy_state'

Conflicts:
	Assets/Meshes/IsraLow.OBJ.meta
	Assets/Scenes/DetectionTest/DetectionTest.unity