Real init
Also real init
Merge branch 'master' of https://github.com/AndrewSB/multi-device-video

Conflicts:
	main/views/index.jade
	node_modules/youtube-player/package.json
	web.js