update
Merge branch 'master' of https://github.com/yoyocicada/multiscreen_demo
update
Merge branch 'master' of https://github.com/yoyocicada/multiscreen_demo

Conflicts:
	public/screenA.html
added the developer buckets
Merge branch 'master' of https://github.com/yoyocicada/multiscreen_demo

Conflicts:
	public/js/multiscreen.js