AI State System strawman added
Merge branch 'master' of https://github.com/bbudian/SGP_Coliseum

Conflicts:
	Debug/BitmapFont.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/CSGD_Direct3D.obj
	Debug/CSGD_DirectInput.obj
	Debug/CSGD_EventSystem.obj
	Debug/CSGD_MessageSystem.obj
	Debug/CSGD_TextureManager.obj
	Debug/CSGD_XAudio2.obj
	Debug/CellAnimation.obj
	Debug/Entity.obj
	Debug/EntityManager.obj
	Debug/Game.obj
	Debug/SGD_Math.obj
	Debug/SGP_Game.exe
	Debug/SGP_Game.ilk
	Debug/SGP_Game.lastbuildstate
	Debug/SGP_Game.log
	Debug/SGP_Game.pdb
	Debug/WinMain.obj
	Debug/cl.command.1.tlog
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/link.write.1.tlog
	Debug/tinystr.obj
	Debug/tinyxml.obj
	Debug/tinyxmlerror.obj
	Debug/tinyxmlparser.obj
	Debug/vc110.idb
	Debug/vc110.pdb
	Game Docs/Code Architechture.vsd
	SGP_Game.sdf
	SGP_Game.v11.suo
Clash error
Merge branch 'master' of https://github.com/bbudian/SGP_Coliseum

Conflicts:
	Debug/BitmapFont.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/CSGD_Direct3D.obj
	Debug/CSGD_DirectInput.obj
	Debug/CSGD_EventSystem.obj
	Debug/CSGD_MessageSystem.obj
	Debug/CSGD_TextureManager.obj
	Debug/CSGD_XAudio2.obj
	Debug/CellAnimation.obj
	Debug/Entity.obj
	Debug/EntityManager.obj
	Debug/Game.obj
	Debug/SGD_Math.obj
	Debug/SGP_Game.exe
	Debug/SGP_Game.ilk
	Debug/SGP_Game.log
	Debug/SGP_Game.pdb
	Debug/WinMain.obj
	Debug/cl.command.1.tlog
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/link.write.1.tlog
	Debug/tinystr.obj
	Debug/tinyxml.obj
	Debug/tinyxmlerror.obj
	Debug/tinyxmlparser.obj
	Debug/vc110.idb
	Debug/vc110.pdb