test & data file for hw3
Merge branch 'hw3-tests' of https://github.com/ctb/cse491-drinkz

Hw 3 more stuff

Conflicts:
	test-data/inventory-data-1.txt