added initial combatant framework

-updated makefile with latest changes. Fixed makefile debug vs normal
builds.
-renamed Direction to direction