updating commits
Merge branch 'master' of github.com:jkeefe/make-map-blink