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
Removed Traps

cuz fuck those guys
Merge branch 'master' into Geoffs_WIP