modified
Merge branch 'doing' of https://github.com/CoderK/VendingMachine-TDD-Study into doing

Conflicts:
	VendingMachine.qunit.js
gogo