webrtc on index.html and sass watch tweak
fixed merge conflict