Merge branch 'kath' into Lennin
Ultimo proyecto

Signed-off-by: lennin hernandez <lennin92@gmail.com>
Merge branch 'Lennin' of git@github.com:lennin92/AGEPYM_MAESTRO.git into
Lennin
Merge branch 'Lennin' into Jonna

Conflicts:
	agepym_maestro/archivos/configuracion.json