Rooms Update
Merge pull request #568 from smogon/f6d029b217a7608d74cb53c978721108

Rooms Update