added angular and d3.js
added d3 and angular
fixed merge conflicts, add angular and d3 to bower