Americano

Grande
2 shots espresso
halfway with water
halfway with 2%
Merge branch 'master' of https://github.com/rgerd/MathCounts

Conflicts:
	input1.txt
	src/CountingListsOfNumbers/Question.java