premerge
Merge branch 'master' of https://github.com/ssterman/cs247-avatar-gestures
added chat rooms