Updated getInventory
Merge branch 'GLADE' of github.com:dekhtyar/CSC366-Spring2013 into GLADE