heatmap edit
heatmap update/fix merge conflict
Merge branch 'master' of https://github.com/corbinpage/twitter-app
add deploy for digitalocean