merging develop
merged
Spotify setup
Spotify setup
Merge pull request #3 from adamhrz/feature/dostrander/spotifySetup

Feature/dostrander/spotify setup