Trying to fix
THIS SHOULD FIX IT ALL

fuckers
Merge branch 'master' into Dunn_Works

Conflicts:
	Text Adventure/bin/.gitignore
	Text Adventure/src/Map.java
	Text Adventure/src/Person.java
	Text Adventure/src/Player.java
	test/src/Colour.class