Merge pull request #38 from dscx/master

test
Merge pull request #39 from dscx/master

changed bg for rooms
preliminary video switching
Merge pull request #40 from bighazycrab/master

preliminary video switching set up