Merge branch 'master' into Dunn_Works
add more email jokes
Merge branch 'master' into Dunn_Works

Conflicts:
	Text Adventure/src/Game.java
fuck this class file bs
Merge branch 'Dunn_Works'
fixed the email format, started gameplay loop also added list of inputs
Merge branch 'Dunn_Works'
Fixed the adjacent rooms bug
Changed the starting room back to 11,7
Game loop
Typos and other word fixes
Fixed damage value
Removed Traps

cuz fuck those guys
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