Merge pull request #14 from exfm/dan-dev

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

Maj dev
Merge branch 'dev' into dan-dev