Player is now displayed as a red dot
mergeconflict resolved
updated RoomTest
Updated RoomTest