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

Conflicts:
	AltOS/launch-sites.txt

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --cc AltOS/launch-sites.txt
index 8c2910e9db97cd9c893e02f92842265749f1d9b4,b3452796340f480b5d33791811c4d255cb3fe7e8..b4ebe40f0d4f7c3438862b2ae56aa1d29e21ec64
--- 1/AltOS/launch-sites.txt
--- 2/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@@ -7,11 -7,11 +7,11 @@@ KLOUDBusters Rocket Pasture:37.16783333
  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/
 -OPROC Discovery Bay:47.97808,-122.896383
 -OROC Brothers:43.79949786336483:-120.6485810681392
 -OROC Sheridan:45.044176:-123.314323
 -OROC Wilsonville:45.297186:-122.759067
 +OPROC Discovery Bay:47.97808,-122.896383:http://4hrockets.blogspot.com/
 +OROC Brothers:43.79949786336483:-120.6485810681392:http://www.oregonrocketry.com/
 +OROC Sheridan:45.044176:-123.314323:http://www.oregonrocketry.com/
 +OROC Wilsonville:45.297186:-122.759067:http://www.oregonrocketry.com/
- QRS Cedar Grove:-27.8512283:152.9624000:http://www.qldrocketry.com/
+ QRS Cedar Grove:-27.8512283:152.9624000:http://qldrocketry.com/
  SCORE Hudson Ranch:38.155602777777778:-104.809119444444444:http://scronline.net/
  Tripoli Colorado Hartsel:39.009247:-105.702338:http://tripolicolorado.org/
 -WAC Sportsman Club:47.815327777777778:-119.427186111111111
 +WAC Sportsman Club:47.815327777777778:-119.427186111111111:http://www.washingtonaerospace.org/