"Desglose retencion Fuente"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/Compania.java
"Pagos Quincenales"
Merge branch 'origin/master'

Conflicts:
	.gitignore
	src/main/java/com/ts/libraries/Compania.java
	src/main/java/com/ts/libraries/Edificio.java
	src/main/java/com/ts/libraries/Gasto.java
	src/main/java/com/ts/libraries/Pago.java
	src/test/java/com/ts/main/Comandos.java
"Signo"