Merge remote-tracking branch 'origin/master'

Conflicts:
	Haunted_Mansion.class
	Room.class
	Room.ctxt

v6

Created a new sub-class in item for items that can be collected.
Also
created a new command word to collect items and wrote a new method
where
the arraylist for items needs to go
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 8c814df319f39920089cf8bceb8477cd9e9b0441.