fixed tests
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
fixed
test & data file for hw3
tests for recipe functionality
more test for recipe functionality (HW 3)
fixed test bug noted by chuy2412
hw3 1
Merge branch 'hw3-tests'
working on part 3
Merge branch 'hw3-recipe-tests'
finished hw 3
fixing merge conflicts hw3