S000: Adding a room

Change-Id: Iafe8127f21e1553030f9d9ef7db931542a992397
Merge pull request #23 from autowitch/dev

S000: Adding a room