Merge branch 'visual'
Merge branch 'master' of https://github.com/cblokker/spotify_hackathon