commit from instance 2 basic file
Merge branch 'master' of https://github.com/pgonzalezAlivebox/git-basic-tutorial
commit automerge
commit manual merge