Made more widget-based
Merge branch 'master' of https://github.com/MassArtSIM/SIMVideoBoard

Conflicts:
	deploy/assets/css/main.css
	deploy/index.html