Fixed damage value
Made the Map track where the player is, not where hes been with the
asterisk
fixed room toString, did w/e to the input loop

this was all done during our meetup
Merge branch 'Dunn_Works'

Conflicts:
	Text Adventure/src/Game.java
	Text Adventure/src/Room.java
fixed conflicts
Merge from master