Volviendo a arreglarlo
Merge branch 'master' of https://github.com/ericzon/mygit