Server.js refactor
final for today
Merge branch 'master' of https://github.com/cirm/MultiVision