Update to logic
changing logic
Merge branch 'master' of https://github.com/datim/MusicOrg
logic changes