Merge branch 'master' into Dunn_Works
inputs basically finished
Merge branch 'master' into Dunn_Works

Conflicts:
	Text Adventure/src/Game.java
lil typo fixes
fixed move methods to make the coordinates backwards FUCK THE CARTESIAN SHIT
comma deleted
Merge branch 'Dunn_Works'
fixed movement methods within the map class

OUUUUU
Merge branch 'master' into Geoffs_WIP