nvm
Merge branch 'master' of github.com:dan1d/musica
git ignores