index on master: 9fb04cc Added printDesc to Item class.
WIP on master: 9fb04cc Added printDesc to Item class.
Small change to displayInventory and WorldMap.h
Merge commit 'stash'