Fixed merge
Merge branch 'master' of https://github.com/rgerd/MathCounts

Conflicts:
	src/CountingIsArithmetic/ChallengeProblems/Context.java
	src/CountingIsArithmetic/ChallengeProblems/Question.java