Pull en laptop de Maik
Merge branch 'master' of https://github.com/RubenSerradas/DocumentoDise-oLenguaje into maik

Conflicts:
	GuavaDiseño/DocumentoDiseno2.mdwn
Merge branch 'master' of https://github.com/RubenSerradas/DocumentoDise-oLenguaje into maik