added basic MaRS test and raised AP2 to 5 as given in the MaRS paper
Merge branch 'simple' into union
Merge branch 'union' into figunion