last night's changes
Merge branch 'master' of https://github.com/Ico093/DungeonFMI

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/CameraLooper.cs.meta
	Assets/Scripts/dungeon_scripts/dungeonPlayerScr.cs.BASE.6640.cs.meta
	Assets/Scripts/dungeon_scripts/dungeonPlayerScr.cs.orig.meta
	Assets/Scripts/npc_scritps/npc2.cs.meta
	Assets/exetendpath.cs.meta
	Assets/hmfScr.cs.meta
	DungeonFMI-csharp.sln
	DungeonFMI.sln
	DungeonFMI.userprefs