adding toggling for multiple chat rooms
merging local changes to master after pull