Provocar un conflicto
Merge branch 'master' of https://github.com/Flip120/ClaseGit

Conflicts:
	file_conflict.txt