changed time back to 15
Merge branch 'master' of https://github.com/justincosentino/cs91-heatmap
Now pulling clusters from server. Also added color scheme.