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

Conflicts:
	AltOS/launch-sites.txt

diff --cc AltOS/launch-sites.txt
index fdc2cea6a4c21b9d97609c319cb4a95dd9d4b163,77b78e8da8ce077fc4897d8a2414bf9ebbd9b506..2bc1e38622dd34edd9fefcc2b2da74cec21b5939
--- 1/AltOS/launch-sites.txt
--- 2/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@@ -6,7 -6,7 +6,7 @@@ COSROCS Challenger:38.99624:-104.773979
  COSROCS Peyton:39.072695:-104.430031:http://cosrocs.org/
  HARA Bragg Farms:34.895875:-86.616211;http://www.hararocketry.org/HARA/Main.html
  KLOUDBusters Rocket Pasture:37.167833333:-97.73975:http://kloudbusters.org/
- MDRA Higgs Farm:39.07854:-75.87634:http://www.mdrocketry.org/
 -MDRA Higgs Farm:39.078541666666667:-75.876345833333333:http://www.mdrocketry.org/
++MDRA Higgs Farm:39.07854167:-75.87634583:http://www.mdrocketry.org/
  METRA Pine Island:41.31939:-74.47077:http://metrarocketclub.org/
  NCR Atlas Site:40.65:-104.38333:http://ncrocketry.org/
  NCR Pawnee North Site:40.885955:-104.63793:http://ncrocketry.org/