More better linking map -> chart
Map edits
Merge branch 'master' of https://github.com/acheson/cs171pj2