changes
Merge branch 'master' of https://github.com/gregblaszczuk/soundcloud

Conflicts:
	js/main.js
l
final
Merge branch 'master' of https://github.com/gregblaszczuk/soundcloud