Intro popup.
Merge branch 'master' of https://github.com/shawnlauzon/water-scout

Conflicts:
	waterscout/js/Map.js
Add conversion stuff