Combine water intake with calorie intake

For example if you drink a non-water beverage which contains both calories and water, Amy would count both.