picking up items will now display them in the inventory panel
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital