marco teorico arreglado
Merge remote-tracking branch 'origin/master'

Conflicts:
	diseño.tex
Merge branch 'master' of https://github.com/ProyectoTICs/informe-2