lalalalal subi el conflicto de brayan
commit de test
cosa maluca (resta y test)
cosa (resta)
Merge branch 'master' of https://github.com/lufe089/CalculadoraJava.git

Conflicts:
	CalculadoraGrupal/test/edu/javerianacali/business/CalcularTest.java