Switch to handle room changes
Merge branch 'master' of https://github.com/JigginsGit/CSGame