mi primer commit

informacion inportante disque y asi
commit a todos los archivos
Mi primer commit interactivo
branch docs updated
Merge pull request #4 from richistron/dev

PR con selfie
Merge pull request #1 from CesarLanderos/dev

branch docs updated
hola lola
Merge branch 'dev'

* dev:
  conflictos

Conflicts:
	README.md
Revert "hola lola"

This reverts commit de879314a6518e1e9aaddb7503b217e3e80c24c4.
cambio simple
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
other docs added
Merge branch 'master' of github.com:CesarLanderos/aprendiendo-git

Conflicts:
	docs/branch.md
Merge branch 'master' of github.com:richistron/aprendiendo-git
checkout updated
Primeros colaboradores
Merge branch 'master' of github.com:richistron/aprendiendo-git into CesarLanderos
added my name