Implement Naive Peace Maker and True Peace Maker strategies
Merge in Stephen's ML