"Incapacidades por Enfermedad"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/Capacitacion.java
	src/main/java/com/ts/libraries/Compania.java
	src/main/java/com/ts/libraries/CuentaAgua.java
	src/main/java/com/ts/libraries/CuentaElectricidad.java
	src/main/java/com/ts/libraries/CuentaInternet.java
	src/test/java/com/ts/main/Comandos.java