something
Merge branch 'master' of https://github.com/knarr/microevents

Conflicts:
	heatmap/js/main.js
images!
Merge branch 'master' of https://github.com/knarr/microevents

Conflicts:
	heatmap/insta.html