CartoDB.js added
Merge branch 'master' of https://github.com/daehon/HeatWave

Conflicts:
	index.html