added classes and descriptions

AY GURL EVER BEEN HIT OVER THE HEAD WIT A WET DRESS SOCK?
Merge remote-tracking branch 'origin/master'

Conflicts:
	input1.txt
	src/CountingMultipleEvents/Context.java
	src/CountingMultipleEvents/Driver.java
	src/CountingMultipleEvents/Question.java
	src/CountingWithAdditionAndSubtraction/AnswerGen.java
	src/CountingWithAdditionAndSubtraction/Context.java
	src/CountingWithAdditionAndSubtraction/Driver.java
	src/CountingWithAdditionAndSubtraction/Question.java
Merge branch 'master' of https://github.com/rgerd/MathCounts

Conflicts:
	src/CountingMultipleEvents/AnswerGen.java
	src/CountingMultipleEvents/Context.java