Enemy works and added two players
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assembly-CSharp-vs.csproj
	DungerMan/Assembly-CSharp.csproj
	DungerMan/Assets/Materials.meta
	DungerMan/Assets/Scripts/Enemy.cs.meta
	DungerMan/Assets/scene1.meta
	DungerMan/Assets/scene1/NavMesh.asset
	DungerMan/Assets/scene1/NavMesh.asset.meta
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/AssetServerCacheV3
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/InspectorExpandedItems.asset
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/ScriptMapper
	DungerMan/Library/assetDatabase3
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/50/503bc046adb3b4137b3e017940231800
	DungerMan/Library/metadata/81/81a0355cbe65b490e8c4a79b6dcd824a
	DungerMan/Library/metadata/82/82ff3482c96f849ec854ea193bc60887
	DungerMan/Library/metadata/bb/bb92962ea107044518934224b22419dd
	DungerMan/Temp/__EditModeScene
Enemy works and added two players
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assembly-CSharp-vs.csproj
	DungerMan/Assembly-CSharp.csproj
	DungerMan/Assets/Materials.meta
	DungerMan/Assets/Scripts/Enemy.cs.meta
	DungerMan/Assets/scene1.meta
	DungerMan/Assets/scene1/NavMesh.asset
	DungerMan/Assets/scene1/NavMesh.asset.meta
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/AssetServerCacheV3
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/InspectorExpandedItems.asset
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/ScriptMapper
	DungerMan/Library/assetDatabase3
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/50/503bc046adb3b4137b3e017940231800
	DungerMan/Library/metadata/81/81a0355cbe65b490e8c4a79b6dcd824a
	DungerMan/Library/metadata/82/82ff3482c96f849ec854ea193bc60887
	DungerMan/Library/metadata/bb/bb92962ea107044518934224b22419dd
	DungerMan/Temp/__EditModeScene