un novato haciendo commit en git
Merge branch 'master' of git://github.com/texai/demogit
Merge branch 'master' of git://github.com/texai/demogit
Merge branch 'master' of https://github.com/texai/demogit