Chris commit
Merge branch 'master' of https://github.com/nathanlmcguire/VendingMachine.git
Chris commit