Merge branch 'master' of github.com:gaqzi/spotify-controller

Conflicts:
	README.md