work inventory use item
Merge origin/master

Conflicts:
	AMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/control/InventoryControl.java
Merge origin/master

Conflicts:
	AMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/control/InventoryControl.java