no gradients
Merge branch 'master' of https://github.com/maximemaheu/MetaCoDDeM_project

Conflicts:
	OptimDesign_functions/demo_VBA.m
	OptimDesign_functions/demo_VBA.m~
	OptimDesign_functions/sigmoid_binomial_nogradients.m
resolved conflicts
Merge branch 'master' of https://github.com/maximemaheu/MetaCoDDeM_project

Conflicts:
	OptimDesign_functions/demo_VBA.m
	OptimDesign_functions/demo_VBA.m~
	OptimDesign_functions/sigmoid_binomial_nogradients.m