wtf
Merge branch 'master' of https://github.com/youplayradio/youplayradio.github.io

Conflicts:
	js/youtube.js
Merge branch 'master' of https://github.com/youplayradio/youplayradio.github.io