romeee 2

en busca del conflicto romeee 2 con commit 22
Merge branch 'master' of https://github.com/jorromigl/prueba-frikisala

Conflicts:
	leeme.md