Agregue un txt
resolve conflicts
Merge branch 'master' of https://github.com/paulomcnally/git-demo