...
Merge branch 'master' of
https://github.com/serious6/CoffeeMaker_Coverage

Conflicts:
	unittests/edu/ncsu/csc326/coffeemaker/AddRecipeTest.java