modified annealing but didn't make it waaay better. Still gives shitty results
Merge remote-tracking branch 'origin/master'

Conflicts:
	est_annealing_v2.m
	f_updateParameters.m