Fixed vending prints
Fixed merge

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

Conflicts:
	vendingmachine.cc