D
umjaskljdfas;ljMerge branch 'master' of github.com:Vendea/ClassCode

Conflicts:
	CompGeo/src/geometry/MakeSimpleMod.java