Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Added Item, Modified Room

- Created all attributes and method bases for Item
- fixed some issues in Room (ArrayList<Item> instead of Item[] as well
as a missing bracket)

P.S. I need more than just Item to work on b/c its almost nothing
Merge branch 'Geoffs_WIP'
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project

Conflicts:
	Text Adventure/bin/Room.class
	Text Adventure/src/Room.java
Cleaned up the merge

I suck so hard at github