play with d3
Merge branch 'master' of github.com:dereksilverman/Future.me into d3-sarah
data is printing to the screen
bar chart doesnt work
three attempts at making the json work, no success yet
dereks changes
merge conflict
got rid of some crap that was hanging around
add code that should work, let's see if it does
it all works huzzah. change the location of the js files and where we call them in the header
fixed industry model
resolve conflicts
add comments to d3.js, create recursive function and click event for bubble
fix merge conflicts