My version
Added Item to each room

Each room can now be assigned item and can be either static or movable
Update Room.java

roomItems was doubled up
Updated items
With inventory
Fixed Inventory
Added Characters
Merge branch 'liam-version'

Conflicts:
	Java Version/Game.java
	Java Version/Room.java