forced commit
Forced

Merge branch 'master' of https://github.com/abarbour/hydrogeo

Conflicts:
	data/diffusiv.rda
	data/shepard.rda