Merge pull request #1 from LELeclercq/master

Fixed rooms being created inside one another