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 into placeholder