teste2
Merge branch 'master' of https://github.com/riseupsolutions/Teste

Conflicts:
	Calcularadora/Calcularadora/Form1.cs