Merge branch 'master' of https://github.com/LO23/BitMusic into editingClasses1