'Implementacion de centros de costos'
Merge branch 'origin/master'

Conflicts:
	HistorialConta.txt
	src/main/java/com/ts/db/Repo.java
	src/main/java/com/ts/libraries/Alquiler.java
	src/main/java/com/ts/libraries/Colaborador.java
	src/main/java/com/ts/libraries/Edificio.java
	src/main/java/com/ts/libraries/Moneda.java
	src/main/java/com/ts/libraries/Pago.java
	src/test/java/com/ts/main/Comandos.java
'CC costosFinancieros'