Made NetBeans Happy
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/VendingGUI.java