Changed character movement checking. Added arrays to follow npc,
monster, and item tracking.
Fixed conflicts
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr