test
merge
Merge branch 'master' of https://github.com/USGS-WiM/NSS
fix some errors
Merge pull request #88 from marsmith/master

tweaks
merge conflicts