better and worse
	modified:   src/NSMaterialConstruction.cc
	modified:   src/NSSD.cc
Merge branch 'master' of github.com:Solarer/NeutronShielding_jpa

Conflicts:
	src/NSSD.cc
merging
	new file:   src/NSSD2.cc