created new managers
managers furthers split
checkout commit
managers done
merge from new managers
builds and runs

battle is broken
Merge remote-tracking branch 'origin/master' into Building

Conflicts:
	MDE.sdf
	MDE.v12.suo
	MDE/ActorManager.cpp
	MDE/ActorManager.h
	MDE/Controls.h
	MDE/x64/Debug/ActorManager.obj
	MDE/x64/Debug/ArtificialIntelligence.obj
	MDE/x64/Debug/Battle.obj
	MDE/x64/Debug/BattleHandler.obj
	MDE/x64/Debug/Character.obj
	MDE/x64/Debug/Controls.obj
	MDE/x64/Debug/EnemyFactory.obj
	MDE/x64/Debug/EnemyGen.obj
	MDE/x64/Debug/Goblin.obj
	MDE/x64/Debug/Inventory.obj
	MDE/x64/Debug/Item.obj
	MDE/x64/Debug/MDE.log
	MDE/x64/Debug/MDE.tlog/CL.read.1.tlog
	MDE/x64/Debug/MDE.tlog/CL.write.1.tlog
	MDE/x64/Debug/MDE.tlog/cl.command.1.tlog
	MDE/x64/Debug/MDE.tlog/link.command.1.tlog
	MDE/x64/Debug/MDE.tlog/link.read.1.tlog
	MDE/x64/Debug/MDE.tlog/link.write.1.tlog
	MDE/x64/Debug/Map.obj
	MDE/x64/Debug/PlaceItemsAndEnemies.obj
	MDE/x64/Debug/RNG.obj
	MDE/x64/Debug/ReadFile.obj
	MDE/x64/Debug/ReadString.obj
	MDE/x64/Debug/TextTexture.obj
	MDE/x64/Debug/Texture.obj
	MDE/x64/Debug/Window.obj
	MDE/x64/Debug/camera.obj
	MDE/x64/Debug/enemy.obj
	MDE/x64/Debug/main.obj
	MDE/x64/Debug/player.obj
	MDE/x64/Debug/vc120.idb
	MDE/x64/Debug/vc120.pdb
	x64/Debug/MDE.exe
	x64/Debug/MDE.ilk
	x64/Debug/MDE.pdb