Changed displayPalaceInventory to accept integer parameters
Merge branch 'controllerTest' of https://github.com/ktn/Iter2 into controllerTest