cambio multiplicacion
resta
division
Merge branch 'conflicto1'

Conflicts:
	calculadora.c