Merge branch 'master' into gcaven
Merge branch 'master' into Geoffs_WIP

Conflicts:
	Text Adventure/src/Test.java
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project
Cleaned up code
Merge branch 'master' into Geoffs_WIP
Merge branch 'Geoffs_WIP' of https://github.com/Mattrask/CSCI1101-group_project
i dint know

okay
Merge branch 'master' into Matts_Work
Merge branch 'Matts_Work' of https://github.com/Mattrask/CSCI1101-group_project
deleted all the junk eclipse created
Extended UML to include the world

Makes sense to have a world object to keep everything in place... Not
sure where player fits in now