Merge branch 'master' into Geoffs_WIP
idk
Merge branch 'master' into Geoffs_WIP
Added credit for myself

all praise me
Merge branch 'Geoffs_WIP'
deleted test.java
Merge branch 'master' into Geoffs_WIP
May have done some unnecessary things to get these to the master branch,
but hopefully it worked out.

Anyway, some stuff in the Person and Player classes is commented out,
but will be un-commented once I look over the other object classes and
know what methods to call etc...
Merge branch 'master' into Geoffs_WIP
Putting stuff up for Geoff

Designed blessboys logo and tested colour
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project
Merge branch 'master' into Geoffs_WIP
Added Map

Included excel, numbers (will look weird on windows and linux) and a pdf
Merge branch 'Geoffs_WIP'
Fixes
Game class to hold the main method.

gimme tha terminal codes assaHOLE
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project

Conflicts:
	Text Adventure/bin/.gitignore
added initial comments
Added some rooms

Only set descriptions and lock status. Eclipse is bitching about the
Person type being missing, but its totally not.
More Rooms and Fixing Shit

-Added instantiation (and null where appropriate) for all rooms.
-Set lock status of all.
-Some have descriptions, most do not.
-Still need to set traps, enemy and item locations.
-Feel free to write descriptions for rooms.
-Rooms are arranged [y][x] since idk, it looked better when I was
writing them and I didn’t realize until I was done
-Fixed toString and setAdjacentRooms to work with [y][x]
-Added credit for myself in map.java b/c I did stuff in it
-Changed the view size of rich thick lore to not be my entire screen
(fuk dunn)