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

Conflicts:
	.gitignore
	hydrogeo.Rproj
	man/dimensional_units.Rd
	man/hydrogeo-package.Rd