Added commit 1
Added commits 2 and 3
Merge branch 'master' of https://github.com/Agusum/advanced_git