clone1 readme editado
clone2 editado
clone1
clone1
commit
sdfasdfsdf
Resolvido conflito no arquivo README.md com a ferramenta DiffMerge

Conflicts:
	README.md