asdf
asdf
dsadas
Merge branch 'kath' of git@github.com:lennin92/AGEPYM_MAESTRO.git into kath
asdf
sdf
Merge branch 'kath' into Alex

Conflicts:
	agepym_maestro/.settings/org.eclipse.core.resources.prefs
	agepym_maestro/ModuloDepto/Departamento.py
lkdklasdlsda;k asdL:k
Agregadas las clases de Categoria
asf
fghfgfghfgh
asdfasdfasdf
asdf
Merge branch 'Alex' into kath
asdf
Merge remote-tracking branch 'origin/Alex' into Jonna