before pull
merge
add histxie.m for hist and guassian fit
fix conflict