Fixed damage value
Merge remote-tracking branch 'origin/master' into lockhart
Made the Map track where the player is, not where hes been with the
asterisk
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
Missed a commit conflict
Added a new Map PDF that has the related coordinates next to it
Created an example for adding Items to the Map
Item toString
Merge
Merge remote-tracking branch 'origin/lockhart'
Fiddled with the readme

made it a bit more helpful about what our deal is
Merge branch 'master' into Geoffs_WIP