dsdfs
hgjghjg
uyjj
Merge remote-tracking branch 'origin/BranchArquitectura'

Conflicts:
	Diseño/pruebaMerge.txt
Merge remote-tracking branch 'origin/master'