commit pull
resolved conflict
Merge branch 'master' of github.com:benheb/mapash-js
topo
resolved conflict
new d3; projection working
Merge branch 'master' of github.com:benheb/mapash-js
move map over for data tab