Change _bottle_types_db from list to set.
Change _inventory_db to a dict instead of a list.
Change add to inventory to convert oz to ml and sum quantities when adding
a bottle.
get_liquor_amount only needs to use the sum calculated by add_to_inventory.
Fix tests to reflect stricter program.
test & data file for hw3
Add new ctb tests.  Fetched only the single new file to avoid merge
ugliness - no other changes seen.
get_liquor_amount() now returns a floating point rounded to 2 digits.
Fix tests to accommodate new get_liquor_amounts.
tests for recipe functionality
more test for recipe functionality (HW 3)
fixed test bug noted by chuy2412
Add recipe class and functionality.
Add convert_to_ml function.
Add tests for new functionality.
Make html.
get_bottle_types() to support making html.
Merge branch 'hw3-recipe-tests'
fixed test name test_get_recipe_2 to test_add_recipe_2
updated tests to check for HW 4 stuff
Merge branch 'master' of https://github.com/ctb/cse491-drinkz

Conflicts:
	drinkz/test_recipes.py
	drinkz/tests_by_ctb.py
	test-data/inventory-data-1.txt
Fix bulk bottle loading.
Also fix load_inventory
Change convert_to_ml to use a dict.
Add app.py module and run_web script.  Still servers stuff from linkz.
Begin changing to accomodate drinkz instead of linkz.
Allow specifying port number on the command line.
More changes from linkz to drinkz.
Handle converting to ml.
Rename run_web to run-web.
Add remaining pages.