Merge branch 'script'
Merge branch 'output_types'

Conflicts:
	drinkz/db.py
	drinkz/test_drinkz.py
HW 2
Merge branch 'master' of github.com:RobotSandwich/cse491-drinkz

Conflicts:
	drinkz/db.py
	drinkz/test_drinkz.py