stu's updates video viewer
Merge branch 'master' of https://github.com/kevmarmol/somethinggoodthenjam

Conflicts:
	modified-webrtc-node/public/js/webrtc-demo.js