text transitions beeyotch
saved all conflicts
Merge branch 'master' of github.com:ajkim/d3_hackathon