add data
delete xraylib call
try
add mat file
get back on track
Merge branch 'master' of https://github.com/ZichaoDi/Tao into HEAD

Conflicts:
	XRF_XTM_Simulation/Define_Detector_Beam_Gaussian.m
	XRF_XTM_Simulation/UnitSpectrumSherman_Gaussian.m
	XRF_XTM_Simulation/XRF_XTM_Tensor.m
	XRF_XTM_Simulation/optXTM_XRF_Tensor.m
move back to own machine
get back again
Merge branch 'master' of https://github.com/ZichaoDi/Tao into HEAD
add new data set from young