Minimum prices = ingredient price
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Beverage.java