minor commit
update to rooms
merged master, resolved conflicts