randomizing on moves
fixed merge conflicts with Rachel and Gabrielle
more merge conflicts resolved