borre conflicto agregue linea 5
Merge branch 'master' of https://github.com/mosqueramaxi/testrepo

Conflicts:
	carpeta2/feliToMerge.txt
aaaa
borrar orig