added vending machine stuff
Merge branch 'master' of https://github.com/mjneil/midwest-hacks