OnePlayerOneMatch, roomPresent tests work
resolved conflicts in merge
resolve merge message
Attempt at generating solution
resolved merge conflicts