Added code to ensure new connecting user loads whiteboard correctly
Actually added fix.. lol
Fixed merge conflicts
Actually added fix