resetting partial changes in sampleellipsoid.hh to the variant without use of ellipsoid object
Merge branch 'master' of https://github.com/jfmrothe/AST523project
Merge branch 'master' of https://github.com/jfmrothe/AST523project

Conflicts:
	sampleellipsoid.hh