added item and inventory
Merge remote-tracking branch 'origin/master'
inventory can now be displayed on the GUI