merge.
Merge branch 'master' of https://github.com/davism4/fearmonger

Conflicts:
	FearMonger-csharp.sln
	FearMonger.sln
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
Moved sprites and art to a Resources folder. Implemented a more advanced AI system.  Set up abilities so that they derive from the Ability parent class. Replaced some old sprites.
Merge branch 'master' of https://github.com/davism4/fearmonger

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/GameManager.cs
	Assets/Scripts/Player/PlayerActivity.cs
	FearMonger-csharp.sln
	FearMonger.sln
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
merge
Merge branch 'master' of https://github.com/davism4/fearmonger

Conflicts:
	Assembly-CSharp.csproj
	Assets/Scripts/Player/PlayerActivity.cs
	FearMonger-csharp.sln
	FearMonger.sln
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Pause menu with abilities and ability selection. 2 abilities so far. Tweaked physics and room layout. Renamed and reorganized some of the assets so that the program can access them more easily. Fixed bugs with room selection, leveling up, and double-counting inputs.