Update README.md
fixing merge conflicts
Refactored Station Details with maps and updated chart controls
Merge branch 'develop' of github.com:devriesm/ColoradoWaters into develop