Dialogue code, stable, swag
fix accessibility bug
doing serious workenings on the battle system
unstable battle code
menu highlightnig working
battle menu stable
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
battle system exchange framework finished
unit killing in battle; exp bounty begin
added UnitSpriteComponent, HP bars
more unitspritecomponent attempts
added unitspritecomponent, healthbars, level
added tints to the units
Merge branch 'lionel' of https://github.com/jdtang13/SeniorSpringVideoGameProject into jon

Conflicts:
	EntityEngine/EntityEngine/EntityEngine/State.cs
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGame/Game1.cs
Pulled Jon Code
fixing conflicts xddd