added Probability.hs
fixed merge conflicts?