basic heatmap added
Datapoints added on heatmap
resolved conflicts