updated settings, added music and sound effects
few tweaks
fixed merge conflicts