avance lectura 28

Signed-off-by: Joao Fuentes <joao@localhost.localdomain>
arreglo de conflicto

Signed-off-by: Joao Fuentes <joao@localhost.localdomain>