Commented some stuff out
Merge branch 'master' of github.com:edgroup/edjuke