added Monticello Tests to filetree. New: MCThreeWayMergingTest