removed duplicate da directory
miyoshi adaptive inflation
Merge branch 'master' of github.com:caja-matematica/dataAssimilation

Conflicts:
	da/assimilateRealObsETKF.m~
parameter estimation progress