Editando 1.txt
2.ttxt
editando 2.txt
editing 1txt for develop
Merge branch 'newFeat' into develop
editando 2.txt
editando 2.txt para dev
Merge branch 'newFeat' into develop

Conflicts:
	2.txt
Update 2.txt
Create README.md
Creando 3pc1
creando 3pc2
3pc2 editado
Editado 3pc2 otra vez
Merge branch 'develop' of github.com:francovenica/GitFlow into develop
Editado
Merge branch 'develop'

Conflicts:
	1.txt
	README.md