Basic player
Merge branch 'master' of github.com:DrunkenPandaFans/dj-panda