new interface
test
Merge branch 'master' of https://github.com/regnaresh/BaristaMatic.git

Conflicts:
	src/coffeedispenser/Ingredient.java