HerdController turned into generic Spawner script.
Added some new wolf head icons. Adjusted the trees' draw distance.
Added in a herdcontroller script that moves a herd. Created a scene with four terrains.
Worked on Herd, NPCActions, and AstarAI.
Merge branch 'JTest' of https://github.com/Tubocass/AnimalSim into BTest

Conflicts:
	AS/AS-csharp.sln
	AS/AS.sln
	AS/AS.userprefs
	AS/Assembly-CSharp-Editor-vs.csproj
	AS/Assembly-CSharp-Editor.csproj
	AS/Assembly-CSharp-vs.csproj
	AS/Assembly-CSharp.csproj
	AS/Assets/Scenes/Test1.unity
	AS/Library/InspectorExpandedItems.asset
	AS/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-CSharp.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-UnityScript.dll
	AS/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	AS/Library/assetDatabase3
	AS/Library/guidmapper
	AS/Library/metadata/13/13c800f349a25584283af7d12c14da0a
	AS/Library/metadata/20/200dcc3068ea2ec43843158132b20606
	AS/Library/metadata/26/26a9837164567c041940c1b4a8c32810
	AS/Library/metadata/2d/2dfacf14877688642a49ece87e23e302
	AS/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	AS/Library/metadata/46/46217c5257e4d964d8130fb8c3e3f418
	AS/Library/metadata/6a/6ae98d296990fa14c93e09204554e8aa
	AS/Library/metadata/76/7639d3eacf0346443a08e1aa28841de8
	AS/Library/metadata/91/918a6ed0b6fabc1408a9d15074e92dfd
	AS/Library/metadata/9f/9f7f5b0b0dc816c4b80272fb8a6bfe2a
	AS/Library/metadata/d6/d6f2e3c33c5313946889c92cd3e4d093
	AS/Library/metadata/dc/dc01b859d43a44c4cbf19fee6f14a28b
	AS/Library/shadercompiler-1.log
Herd.cs modded slightly. Outline for NPCactions.
NPC's rotate. NPC model changed to Jaguar while we work on animation system.
Messed with animator and collision with food.
Food objects become triggers and freeze in place. NPCs point in right direction now.
Merge branch 'JTest'

Conflicts:
	AS/AS-csharp.sln
	AS/AS.sln
	AS/AS.userprefs
	AS/Assembly-CSharp-vs.csproj
	AS/Assembly-CSharp.csproj
	AS/Assets/Assets/Animators/NPCAnimatorController.controller
	AS/Assets/Assets/BigCat/Animations/Big_Cat_Idle.fbx.meta
	AS/Assets/HerdController.cs.meta
	AS/Assets/NPCSight.cs.meta
	AS/Assets/NPCanimation.cs.meta
	AS/Assets/NPCs/AstarAI.cs
	AS/Assets/Player/HealthScript.cs.meta
	AS/Assets/Prefabs/Food.prefab
	AS/Assets/Prefabs/NPCprefab.prefab
	AS/Assets/Scenes/Test1.unity
	AS/Assets/Scripts/Enemy.cs.meta
	AS/Assets/Scripts/HerdController.cs
	AS/Assets/Scripts/HerdController.cs.meta
	AS/Assets/Scripts/NPCs/NPCSight.cs
	AS/Assets/Scripts/NPCs/NPCSight.cs.meta
	AS/Assets/Scripts/NPCs/NPCanimation.cs
	AS/Assets/Scripts/NPCs/NPCanimation.cs.meta
	AS/Assets/Scripts/Spawner.cs.meta
	AS/Library/CurrentLayout.dwlt
	AS/Library/InspectorExpandedItems.asset
	AS/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-CSharp.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-UnityScript.dll
	AS/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	AS/Library/assetDatabase3
	AS/Library/expandedItems
	AS/Library/guidmapper
	AS/Library/metadata/03/035fba1602e2b474aaab0bf144c79762
	AS/Library/metadata/08/08f038eea1f9746bc9698bce5758c428
	AS/Library/metadata/10/10f160c0666ab463c9ee4c3756af11d4
	AS/Library/metadata/12/12c92e4e60cd84f48ae88e08f63ad0b5
	AS/Library/metadata/13/13c800f349a25584283af7d12c14da0a
	AS/Library/metadata/16/16e7ae0d37eb55241810808afc3dafca
	AS/Library/metadata/2d/2dfacf14877688642a49ece87e23e302
	AS/Library/metadata/2f/2fe210e946592b7418e2d0d46c3c4504
	AS/Library/metadata/32/32fd2962fafc7459bad1627967d3233e
	AS/Library/metadata/46/46217c5257e4d964d8130fb8c3e3f418
	AS/Library/metadata/5a/5a7d86e8912d446c4ae00f3fa91892ca
	AS/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	AS/Library/metadata/76/7639d3eacf0346443a08e1aa28841de8
	AS/Library/metadata/8d/8dceb10a2d1169241b0b7b37059fc6cb
	AS/Library/metadata/9f/9f7f5b0b0dc816c4b80272fb8a6bfe2a
	AS/Library/metadata/c3/c31a297dca42544d5bdb21f8ecfe63cd
	AS/Library/metadata/cb/cb2c773fd4471a2499292ebeda29910b
	AS/Library/metadata/d1/d14714301468b304d84963cc373883ff
	AS/Library/metadata/d6/d6f2e3c33c5313946889c92cd3e4d093
	AS/Library/metadata/db/db90800f42fac42be8600366515038ef
	AS/Library/metadata/f3/f30ddb5928fe01c448e4736ec9aff917