Corrijo el conflicto
	modified:   Memoria/Arquitectura.lyx
Merge branch 'master' of https://github.com/lbarriosh/cygnus-cloud