replaced settings with controls screen, all music is updated
Merge branch 'master' of https://github.com/TylerCrouse/RBR