commit to pull
modified the look of the Chat page. both messages and participants scroll independently now
fixed up other merge conflicts