Test: Editando 1.js.
Merge branch 'master' of https://github.com/jansanchez/git-basic