add total people and companies to industries json page
experiment with d3
fix merge conflict
create migrations to fix user_people table
add comments to d3.js, create recursive function and click event for bubble
fix merge conflicts
add the source to industries serializer so it can be passed in as a parameter when calling the new display function
add pg gem
angular first pass and working
solve merge conflicts
add home page and foundation
change project name
minor tweaks
FIX IT ASHLEY WE LOVE YOU
Merge branch 'angular' of github.com:dereksilverman/Future.me into angular
run migrations
Merge branch 'angular'