everthing works at this point
Merge branch 'master' of https://github.com/taloto07/MusicBox.git