adding room, desk, pin tables.
merge
 merge
Merge remote-tracking branch 'origin/master'