Fix so doesn't block video router
Merge branch 'morgan' of https://github.com/rmtmckenzie/cscw-icebreaker into morgan
Merge changes to master into morgan
Merge pull request #61 from rmtmckenzie/morgan

Fix video router method