Combat works! Its ugly but it does the job, still having the strange
error where the mv doesn't display but the information is there.
Re-added directionp to utilities, seems to have been deleted when the
functions where moved
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr

Conflicts:
	DungeonCrawlJr/acl2/character.lisp
Cleaned up combat with a new helper function, added new monster files
Room files shouldn't be under source control, because they're re-generated every time the program is run.
Merge branch 'master' into no-circular-imports

Conflicts:
	DungeonCrawlJr/acl2/character.lisp
	DungeonCrawlJr/acl2/combat.lisp