Merge branch 'gh-pages' of https://github.com/redfoxkamakura/heatmapsample into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/redfoxkamakura/heatmapsample into gh-pages

Conflicts:
	index.html