-e
no conflict
Adding complex toy model
Merge branch 'master' of github.com:diogro/bayesian-cov-estimation