manually merge; closes #85
manually merge; closes #85

tanhaiwang/gmusicapi,TheOpenDevProject/gmusicapi,nvbn/Unofficial-Google-Music-API,simon-weber/Unofficial-Google-Music-API,thebigmunch/gmusicapi,jimyx17/gmusic,simon-weber/gmusicapi,dvirtz/gmusicapi,peetahzee/Unofficial-Google-Music-API,dvirtz/gmusicapi