worked on gen3
Merge branch 'master' of https://github.com/rgerd/MathCounts

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