testing 2
Merge branch 'master' of https://github.com/ucdavis-ice/HSRStorymap

Conflicts:
	README.md