changed the type of classes
Merge branch 'master' of github.com:nick8325/jukebox
Merge branch 'master' of github.com:nick8325/jukebox