FUN

:information_desk_person:
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/VendingGUI.java
Merge

Resolved