pre merge
Merge branch 'master' into ui
added video and did a lot of styling
chat logic
Merge branch 'ui' into chat