Reginald, Other things

you have encountered a Reginald
Merge branch 'Geoffs_WIP'
Room descriptions
Merge remote-tracking branch 'origin/master' into lockhart
Room descriptions
Merge branch 'master' into Geoffs_WIP
Prints items in room with description
Unlock method
Unlock adjacent rooms
Finished Descriptions, other small tweaks

boo-shakalah
Merge branch 'Geoffs_WIP'
Items - Row 1
Added weapons, keys and statues
Added potions and generic enemy weapons
Update map to reflect additions
Formatting in weapons section to refer to variable names
Created enemies and added to correct rooms
Merge branch 'master' into Dunn_Works

Conflicts:
	Text Adventure/src/Game.java