initial commit
changed load_inventory arguments to use singleton db
fixed tests
added test stub for bulk loading of bottle types
updated with the story so far
Merge branch 'master' into test_fix
fixed final tests
implemented simple bulk load script w/tests
added function to retrieve liquor amount
added get_liquor_inventory and associated print script
Merge branch 'script'
Merge branch 'output_types'

Conflicts:
	drinkz/db.py
	drinkz/test_drinkz.py
Homework 2, brochacho. Did all dat shiiiiit
test & data file for hw3
Dat Homework3, brooooo
tests for recipe functionality
more test for recipe functionality (HW 3)
fixed test bug noted by chuy2412
Merge branch 'hw3-tests' of https://github.com/ctb/cse491-drinkz

Hw 3 more stuff

Conflicts:
	test-data/inventory-data-1.txt
Merge branch 'hw3-recipe-tests'
MURGE