teste commit
Merge branch 'master' of https://github.com/rchibana/MisterMath

Conflicts:
	testeeeeeee

Alterações.....