Fixed map number problem, added initial generation of character and
room.
Merge branch 'master' of https://github.com/ou-se-sp14-team-stallman/dungeon-crawl-jr

Conflicts:
	DungeonCrawlJr/src/core/Character.java
	DungeonCrawlJr/src/core/GUI.java