añado 6
Merge branch 'master' of https://github.com/FcoJavierEsc/LarryGitHub

Conflicts:
	lp06.md