soundcloud api
Merge branch 'master' of https://github.com/consolacao/www.tajine.de

Conflicts:
	README.md
deconflicted
work in progress