a
a
Merge branch 'master' of https://github.com/sergiofillipi/Calculadora
Merge branch 'master' of https://github.com/sergiofillipi/Calculadora

Conflicts:
	b.txt
a