Merged d3 and Angular seed
Built HeatmapCtrl unit test spec
Modified controllerSpec and moved test to End2End Scenario
Built directive framework for heatmap
Light syntax edits
Testing committ, contians file upoad stuff
added controller and route provider for heatmap viewing
Wrote heatmap partial
Light changes to visHeatmap Directive and linked d3
Resolved merge conflicts in controllers.js with matrix-view
Directive/controller completed. D3 broken
Fixed syntax errors in controller.js and upload.html
Tweaks on directive. Bug in function definitions in link
Heatmap built
bootstrap added
Cleaned heatmap directive
Updated file upload algorithm. Better angular incorporation and multiple/sequential file uploads possible
Added Heatmap resizing and color scheme features
hold
Added asthetic changes