Fixed collab redraw error, needed to initialize a var
Fixed merge conflicts
Merge pull request #164 from StanfordHCI/at-collabFix

Fixed collab redraw error