Merge branch 'master' of https://github.com/ijsalazarmx/gestionProyecto

Conflicts:
	4.- Código/AnaIsRepo/build/classes/View/ViewBasePrincipal.class
	4.- Código/AnaIsRepo/build/classes/View/ViewInit.class
	4.- Código/AnaIsRepo/build/classes/View/ViewLoggin.class
	4.- Código/AnaIsRepo/nbproject/private/private.properties
as

as
Merge remote-tracking branch 'origin/master'

Conflicts:
	6.- Resource/Logos(Ai)/LogosCarola/Thumbs.db
	6.- Resource/Logos(Ai)/Thumbs.db