Conflicts:
	matlab/dynare_estimation_1.m
	matlab/global_initialization.m