Adding in the player & controller
Merge branch 'master' of https://github.com/SandyWalsh/jukebox