Merge branch 'master' of ssh://git.gag.com/scm/git/web/maps.altusmetrum.org
-rw-r--r-- 491 index.mdwn
-rw-r--r-- 5527 launch-sites.txt