merge
merge??

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

Conflicts:
	.gitignore
	hydrogeo.Rproj