adfds
gg
Merge branch 'brdes_Arquitectura' into BranchArquitectura

Conflicts:
	Verificacion/Nuevo Documento de texto.txt