Added players and room names
Fixed merging conflicts