moved player controls over artwork
Merge branch 'dev' into maj-dev
Merge pull request #15 from exfm/maj-dev

Maj dev