Merge branch 'master' of ssh://git.gag.com/scm/git/web/maps.altusmetrum.org

diff --combined launch-sites.txt
index 246b41b5ea0e78fae9920770d5afe0eed31e265f,517500f1b24bf327bdf1b224ec951c4464cf9421..dd83641abe63f7591059733baa9ec5519a804d4a
--- 1/launch-sites.txt
--- 2/launch-sites.txt
+++ b/launch-sites.txt
@@@ -10,6 -10,7 +10,7 @@@ COSROCS Challenger:38.99624:-104.773979
  COSROCS Peyton:39.072695:-104.430031:http://cosrocs.org
  CRMRC Macquam Shore Road:44.824644:-73.164345:http://www.crmrc.org/
  FAR Friends of Amateur Rocketry:35.3471:-117.80905:http://friendsofamateurrocketry.org/
+ FSA Florida Spacemodeling Association Dyer Park:26.7837:-80.1233:https://fsa-twp.webs.com/
  GRITS Gaskins Farm:31.283055555555556:-83.349444444444444:http://www/gritslaunch.com
  HARA Bragg Farms:34.895875:-86.616211:http://www.hararocketry.org/HARA/Main.html
  HARA Manchester:35.489537:-85.962438:http://www.hararocketry.org/HARA/Main.html
@@@ -43,7 -44,8 +44,8 @@@ PMW Talladega, AL:33.3158:-86.1711:http
  POTROCS Keyes, OK:36.707778:-101.169389:http://www.potrocks.org
  POTROCS Sunray, TX:36.0063:-101.7089639:http://www.potrocs.org
  QCRS Princeton, IL:41.492183333333333:-89.503033333333333:http://qcrs.us/
- QRS Cedar Grove:-27.8512283:152.9624000:http://qldrocketry.com
+ QRS Cedar Grove:-27.8512283:152.9624000:https://qldrocketry.com
+ QRS Funny Farm:-28.128375:149.7025472:https://qldrocketry.com
  Radical Rocketeers:40.899878:-74.867381:http://www.radrocketeers.org
  Richard Bong State Recreation Area:42.626167:-88.160507:http://www.tripoliwisconsin.com
  Rocketry South Carolina:34.109209:-80.551657:http://rocketrysouthcarolina.org
@@@ -65,7 -67,6 +67,7 @@@ Tripoli Houston Hearne Airport:30.86114
  Tripoli Idaho Swan Falls:43.23765:-116.32373:http://www.tripoliidaho.org
  Tripoli Louisiana Goldmine Plantation:32.2073:-91.8567:http://www.tra-la.org
  Tripoli MoKan Walnut Grove:37.448033:-93.6150833:http://www.teeniemunde.org/
 +Tripoli North Texas (Akroville):33.390253:-97.388583:
  Tripoli Vegas Delamar:37.318910:-114.959095:http://www.tripolivegas.com/
  TTRA Rocking V Ranch:28.091666666666667:-82.17:http://www.tripoli-tampa.com/
  UROC Frank Hunt Field:40.21879:-112.24618:http://www.uroc.org