Added the code to heatmap.js
Merge branch 'master' of https://github.com/sgarza62/hackathon

Conflicts:
	heatmap/static/javascript/heatmap.js
Merge branch 'master' of https://github.com/sgarza62/hackathon
Added preliminary map functionality to the main page.