added scrolling to chat room
pulling stuff
merge
merge