status info added
Mi primer commit

modificamos el archivo para agregar información importante bla bla bla
Mi primer commit interactivo

fix #54
branch docs updated
Merge pull request #4 from richistron/dev

PR con selfie
conflictos
hola lola
Merge branch 'dev'

* dev:
  conflictos

Conflicts:
	README.md
Revert "hola lola"

This reverts commit de879314a6518e1e9aaddb7503b217e3e80c24c4.
cambio simple
conflictos
Merge branch 'master' of github.com:richistron/aprendiendo-git

Conflicts:
	README.md
	docs/commit.md
	docs/status.md
Merge branch 'dev'

* dev:
  conflictos

Conflicts:
	README.md
Merge branch 'master' of github.com:richistron/aprendiendo-git

Conflicts:
	README.md
Merge branch 'master' of github.com:CesarLanderos/aprendiendo-git

Conflicts:
	docs/branch.md