nothing much
Merge branch 'master' of https://github.com/brauna4/GraceMath.git

Conflicts:
	bin/classes/com/example/gracemath/Addition$1.class
	bin/classes/com/example/gracemath/Addition.class
	bin/classes/com/example/gracemath/MainActivity.class