Working on displaying stats and such in the GUI
Merge branch 'master' of github.com:ou-se-sp14-team-stallman/dungeon-crawl-jr

Conflicts:
	DungeonCrawlJr/src/core/GUI.java