changed parameter vector to reflect new estimates
Merging the hammer and local version of this program
Merge branch 'master' of https://github.com/veryshuai/EEJKT_est