Modified the last line
Merge branch 'master' of github.com:carlosparaciari/example_folder

Conflicts:
	file.txt