cloud 9 import
Merge branch 'master' of https://github.com/AndrewSB/multi-device-video

Conflicts:
	web.js