Escrito el Prólogo
Merge branch 'master' of https://github.com/antoniovillena/PracticasArm

Conflicts:
	B6.Prologo.tex