Updated merge notes.
Tauka commit

Just adding in all the things I wanted to work on. Nothing of importance
whatsoever.
Buggered music. AGAIN.
Merge remote-tracking branch 'origin/master' into main-server