No funciona el gitignore
Merge branch 'master' of github.com:cherra/bob into dev