Otro intento
Merge branch 'master' of https://github.com/androdri/repos
asd
Conflicts:
	otherFile.txt
Merge branch 'master' of https://github.com/androdri/repos