Added changes to show NPC text to show in GUI.
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr.git
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr