Merge branch 'master' of https://github.com/notpeter/vector-river-map
Merge branch 'master' of github.com:NelsonMinar/vector-river-map