Resolving conflict
Merge branch 'master' of https://github.com/musixmatch/api-proxy-node-js