local changes
updated merge

Merge branch 'master' of https://github.com/USEPA/lakemorpho

Conflicts:
	vignettes/lakemorpho_manuscript.Rmd