broke player apart from playlist
Merge branch 'master' of https://github.com/robr24/mash