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

Conflicts:
	src/CountingListsOfNumbers/Context.java