Fix musics table
Fix merge conflicts
Merge branch 'master' of https://github.com/didacube/duke-ldoc