merge
error
fixes to program equivalence check, uncovered design bug
reverting commits, because compile errors exist
merge with rebecca
got rid of accessor functions, we now just interrogate the datatype
merge