Fichero creado para conflicto
Merge branch 'master' of https://github.com/kiuby88/testGitHub

Conflicts:
	Test.txt