'Creacion de rubros e incorporacion de luz y capacitacion a costosFinancieros'
Merge branch 'origin/master'

Conflicts:
	HistorialConta.txt
	src/main/java/com/ts/libraries/Alquiler.java
	src/main/java/com/ts/libraries/Capacitacion.java
	src/main/java/com/ts/libraries/Colaborador.java
	src/main/java/com/ts/libraries/Edificio.java
	src/main/java/com/ts/libraries/Materiales.java
	src/main/java/com/ts/libraries/Pago.java
	src/main/java/com/ts/libraries/Proyecto.java
	src/main/java/com/ts/libraries/RubroDeGasto.java
	src/test/java/com/ts/main/Comandos.java
'metodo costosFinacieron con nuevos rubros'