stashing commit, still working on a syntax error in disjoint.h
pushing to github