Large changes to combat, small additions to main
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr

Conflicts:
	DungeonCrawlJr/acl2/main.lisp