Merge branch 'master' of https://github.com/RazorDude/OOPTeamwork

Conflicts:
	DarkDungeon.WF/DarkDungeon.WF.v12.suo
	DarkDungeon.WF/Data/Characters/Enemies/Enemy.cs
	DarkDungeon.WF/Data/Characters/Movement/Movement.cs
	DarkDungeon.WF/Data/Data.csproj
	DarkDungeon.WF/Data/Items/Obtacles/Obtacle.cs
	DarkDungeon.WF/Data/bin/Debug/Data.dll
	DarkDungeon.WF/Data/bin/Debug/Data.pdb
	DarkDungeon.WF/Data/obj/Debug/Data.csproj.FileListAbsolute.txt
	DarkDungeon.WF/Data/obj/Debug/Data.dll
	DarkDungeon.WF/Data/obj/Debug/Data.pdb
	DarkDungeon.WF/GUI/Level.cs
	DarkDungeon.WF/GUI/Window.cs
	DarkDungeon.WF/GUI/bin/Debug/GUI.exe
	DarkDungeon.WF/GUI/bin/Debug/GUI.pdb
	DarkDungeon.WF/GUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	DarkDungeon.WF/GUI/obj/Debug/GUI.csproj.FileListAbsolute.txt
	DarkDungeon.WF/GUI/obj/Debug/GUI.csproj.GenerateResource.Cache
	DarkDungeon.WF/GUI/obj/Debug/GUI.csprojResolveAssemblyReference.cache
	DarkDungeon.WF/GUI/obj/Debug/GUI.exe
	DarkDungeon.WF/GUI/obj/Debug/GUI.pdb
Merge branch 'master' of https://github.com/RazorDude/OOPTeamwork

Conflicts:
	DarkDungeon.WF/DarkDungeon.WF.v12.suo
	DarkDungeon.WF/Data/Characters/Enemies/Enemy.cs
	DarkDungeon.WF/Data/Characters/Movement/Movement.cs
	DarkDungeon.WF/Data/Data.csproj
	DarkDungeon.WF/Data/bin/Debug/Data.dll
	DarkDungeon.WF/Data/bin/Debug/Data.pdb
	DarkDungeon.WF/Data/obj/Debug/Data.csproj.FileListAbsolute.txt
	DarkDungeon.WF/Data/obj/Debug/Data.dll
	DarkDungeon.WF/Data/obj/Debug/Data.pdb
	DarkDungeon.WF/GUI/Level.cs
	DarkDungeon.WF/GUI/Window.cs
	DarkDungeon.WF/GUI/bin/Debug/GUI.exe
	DarkDungeon.WF/GUI/bin/Debug/GUI.pdb
	DarkDungeon.WF/GUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	DarkDungeon.WF/GUI/obj/Debug/GUI.csproj.FileListAbsolute.txt
	DarkDungeon.WF/GUI/obj/Debug/GUI.csproj.GenerateResource.Cache
	DarkDungeon.WF/GUI/obj/Debug/GUI.csprojResolveAssemblyReference.cache
	DarkDungeon.WF/GUI/obj/Debug/GUI.exe
	DarkDungeon.WF/GUI/obj/Debug/GUI.pdb