vending machine
Merge branch 'master' of https://github.com/spqchan/cs343soda
merged vending machine