Merge branch 'kath' into Lennin
asd
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
asdfasdf
asfdd
Merge branch 'kath' into Jonna

Conflicts:
	agepym_maestro/ModuloAsociados/GAsociados.py
	agepym_maestro/Principal/principal.py
	agepym_maestro/archivos/configuracion.json
Ultimo....


Signed-off-by: PALMA <PALMA@10.10.201.37>
Agregado la opcion de imprimir :D
Ultimo proyecto

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

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

Conflicts:
	agepym_maestro/archivos/configuracion.json
Merge branch 'master' into Jonna

Signed-off-by: lennin hernandez <lennin92@gmail.com>
Merge remote-tracking branch 'origin/master'


Signed-off-by: lennin hernandez <lennin92@gmail.com>