change to integration parameters from office
Merge branch 'master' of github.com:zhangjunsin/baryonmm

Conflicts:
	gsl/Makefile
	gsl/base.c
	gsl/base.h