Merge pull request #6 from Stefaney/Stefaney

Test
added switch room
Merge pull request #7 from Stefaney/finished_boo

added switch room
final
final