Merge branch 'master' into Dunn_Works
idkkkkkkkkk
IDKKKK
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
FIXED CONFLICTS WITH MAIN METHOD
Merge branch 'Dunn_Works'
Merge branch 'Geoffs_WIP'

wtf
Trying to fix
THIS SHOULD FIX IT ALL

fuckers
Starting FRESH
LETS TRY AGAIN

Copied, but did not MERGE my files from lockhart branch
merge into ma branch

hyup