Ignore the .spotify directory
Merge branch 'master' of github.com:Burgestrand/spotify

Conflicts:
	.gitignore