添加了从Recipe生成指令文字的函数. Added a function to make instruction text from Recipe.
Merge remote-tracking branch 'slyandys/master'
Merge branch 'master' of https://github.com/slyandys/5900cocktail.git
Changing some names in the recipe class ctor.
Use the recipes in recip[sic] instead of hardcoded judging code
Use the Recipe class instead of hardcoded prompt
received changes from summer (drag changes)
zero out dragdose when mouse released
Merge branch 'receiving'
Accessories and BaseLiquid are now sub-classes of new class Ingredient.
Don't set up new liquids only to remove them
make the hit test its own function. Stop the kind of ingredient from changing
merge in stuff (with sthe story mode stuff)
Merge branch 'receiving'

Conflicts:
	Cocktail/Accessories.pde
	Cocktail/BaseLiquid.pde
	Cocktail/Cocktail.pde
	Cocktail/Container.pde
	Cocktail/Controls.pde
	Cocktail/Model.pde
	Cocktail/disPlays.pde
colors!
stuff happened
getting rid of sketch.properties
Merge branch 'master' of https://github.com/slyandys/5900cocktail.git

Conflicts:
	Cocktail/Cocktail.pde
	Cocktail/Container.pde
	Cocktail/Controls.pde
	Cocktail/Model.pde
	Cocktail/Recipe.pde
	Cocktail/disPlays.pde
Add challenge mode prompt
change position