Prueba de conflicto
Merge branch 'master' of https://github.com/lufe089/CalculadoraJava.git

Conflicts:
	CalculadoraGrupal/src/edu/javerianacali/business/CalculadoraImpl.java