xx
Merge branch 'master' of https://github.com/ZardAi/ChromecastTest

Conflicts:
	receiver/index.html