Dialogue code, stable, swag
Sure
Merge remote-tracking branch 'origin/lionel' into Oliver

Conflicts:
	EntityEngine/EntityEngine/EntityEngine/State.cs
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGame/Game1.cs
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGame/bin/x86/Debug/EntityEngine.dll
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGame/bin/x86/Debug/EntityEngine.pdb
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGame/bin/x86/Debug/SeniorProjectGame.exe
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGame/bin/x86/Debug/SeniorProjectGame.pdb
Merge branch 'master' of https://github.com/jdtang13/SeniorSpringVideoGameProject into Oliver
Added seen/knownUnitLists and update functions
Pulled Jon Code
fixing conflicts xddd