almost there
resolved merging conflict. temp removed d3&raphael again
resolved merging conflict