Linea 2
Merge branch 'master' of github.com:robertobermejo/git_prueba

Conflicts:
	README