Revert "Revert "test""

This reverts commit 97db9afb1fe7c8d7cbdc6594dad7631dd24a51cb.
Revert "test"

This reverts commit 8ed463a26464192ba0fe53eaae1648b565d9f234.
Revert "first paste"

This reverts commit c75155dae2035fbebc1a1a0e7049b85de5dfb164.

Conflicts:
	js/calculate.js
	js/map/page.js
	js/pull_image.js
	map.html
Revert "test"

This reverts commit 8ed463a26464192ba0fe53eaae1648b565d9f234.
fall