Drinks take 3 seconds to make
Merge branch 'master' of https://github.com/lizzb/kaffeeklatsch

Conflicts:
	Assets/Scripts/CoffeeShop.cs