My commit rules all

like the one ring
Merge remote-tracking branch 'origin/master'

Conflicts:
	MathApplication/app/build.gradle