sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/CountingMultipleEvents/Context.java
Merge branch 'master' of https://github.com/rgerd/MathCounts

Conflicts:
	src/CountingMultipleEvents/Context.java
Merge branch 'master' of https://github.com/rgerd/MathCounts

Conflicts:
	src/CountingMultipleEvents/Context.java