.
Merge branch 'master' of https://github.com/tomconnolly/aws

Conflicts:
	spotify/artist.html
	spotify/index.html
Merge branch 'master' of https://github.com/tomconnolly/aws
Merge branch 'master' of https://github.com/tomconnolly/aws
Merge branch 'master' of https://github.com/tomconnolly/aws
Merge branch 'master' of https://github.com/tomconnolly/aws
Merge branch 'master' of https://github.com/tomconnolly/aws
Merge branch 'master' of https://github.com/tomconnolly/aws
fixed merge conflict