Fix to prevent messed up merging.

rooms & players now in a group...
F = Final , C = Cameron's edit , E = Elliot's edit
edit in your version and later manual add to the Final...