fixed weird stuff
Merge branch 'master' of https://github.com/josh-of-all-trades/Music2