Added to GUI and Inventory

Added to GUI and Inventory
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/VendingGUI.java
RESOLVED!