minor
fixed merge conflicts
added MCMC program, big improvement