Added Spotify Library.
Fixed merge conflict in gitignore.