Merge branch 'master' into pathfinding
Merge branch 'pathfinding'
deleted existing pathfinding
Revert adcf5c4..e6ee03a

This rolls back to commit adcf5c4e8752232a1d6864160c9b25fa84fda2c3.
added wolves to test scene
Merge branch 'pathfinding'

This reverts commit f514d8b6fe7eaa7b24914907a804beda818a5d77, reversing
changes made to 86b8ce67877c626c4c9e1da5e4d13ff0855103cb.

Conflicts:
	Assets/AstarPathfindingProject/ExampleScenes/Materials/OrangeGround.mat
	Assets/Hard Surface Free/Shared/props/Robot/Materials.meta
	Assets/Hard Surface
Free/Shared/props/Skull/Materials/Skull_Free_Crystal_Diffuse.mat.meta
	Assets/Melee.cs.meta
	Assets/ModularPieces/StoneWall.meta
	Assets/_BenCohen Test Folder/Prefabs/Wolf.prefab
	Assets/_BenCohen Test Folder/Prefabs/Wolf.prefab.meta
	Assets/_BenCohen Test Folder/_Scenes/PathfindingTestScene.unity
	Vera.userprefs
Reomved all traces of pathfinding bullshit

guh
Merge branch 'master' of https://github.com/menohack/Vera

Conflicts:
	Assets/DayNight.cs
	Assets/Resources/Buildings/Wall.prefab
	Assets/WorldMachineHeightmapTest.unity
	Assets/_BenCohen Test Folder/Prefabs/Wolf.prefab