local commit
Merge branch 'master' of https://github.com/rafewenger/sharpiso

Conflicts:
	src/mergesharp/mergesharp_isovert.cxx
	src/mergesharp/mergesharp_merge.cxx