added inventory instance to room class and updated inventory
Merge branch 'Inventory'