err a out
Antes de "Partida doble"
Merge branch 'HoraActualAgregada' of https://github.com/racsoraul/SIC into HoraActualAgregada

Conflicts:
	build/classes/sic/Transaccion$1.class
	build/classes/sic/Transaccion$2.class
	build/classes/sic/Transaccion$3.class
	build/classes/sic/Transaccion$4.class
	build/classes/sic/Transaccion.class
	build/classes/sic/Transaccion.form
	src/sic/Transaccion.form
	src/sic/Transaccion.java