idk trying to fix it
god
Revert "Merge branch 'master' into gh-pages"

This reverts commit 2123be7f7188a9ac8755a79320c0cc16f194f576, reversing
changes made to 4324e97e722b230cedf722b672e62d55e9c25511.

Conflicts:
	energy.json
	index.htm
Merge branch 'gh-pages' of https://github.com/johncaseysmith/bitcoinvis.git into gh-pages

Conflicts:
	energy.json
	index.htm