Video almost working (I think...)
video chat working
conflict in main.js fixed
merge successful