Player things
Merge branch 'master' of https://github.com/joshcaron/McJukebox
Added logo
Fixed merge conflict