fichero commiteado
Merge branch 'master' of https://github.com/kazeborja/test-repo

Conflicts:
	fichero1.txt