Wants me to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
Revert "WIP - Loading Data"

This reverts commit 8d853bf2bed0d9fd13e42676812d0510775b482d.

Conflicts:
	js/main.js
Please let this be fixed already.
Merge branch 'master' of https://github.com/kkowalsky/historyofabortionmap