record estimation
configs
crop 210
210pm_cropped_adjoint
consolidate crop210
bla
Solve the merge problem.
Merge remote-tracking branch 'ggomes/master'

Conflicts:
	data/test_network.properties
plot test result.