More musicgit status
Merge conflicts solved
Geluid fixes
sound
Merge conflicts solved
MErging complete