?
Merge branch 'master' of https://github.com/jajcayn/multi-scale

Conflicts:
	cond_mean_evolution.py