updates to Quad.hs that were apparently lost
merging silly conflicts
merge without middle element should now be working properly.
It has yet to be tested, but it typechecks, which means a lot here!