update3
Merge remote-tracking branch 'origin/master'

Conflicts:
	dynamic probe microscopy3.ipynb