Bunch of Stuff

You don't even know
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/VendingMachine.java