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
Merge branch 'master' of https://github.com/mmarinetti/cse491-numberz