updated files
Merge branch 'master' of github.com:rafewenger/sharpiso

Conflicts:
	src/computegrad/cgradient.cxx
Merge branch 'master' of github.com:rafewenger/sharpiso
Merge branch 'master' of github.com:rafewenger/sharpiso
add the mergesharp.py and the datagen.py