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

diff --git a/AltosDroid/index.mdwn b/AltosDroid/index.mdwn
new file mode 100644 (file)
index 0000000..ae95a24
--- /dev/null
+++ b/AltosDroid/index.mdwn
@@ -0,0 +1,26 @@
+# AltosDroid
+
+AltosDroid is the [Android](http://android.com) port of Altus Metrum's 
+ground station program, designed to work with the [TeleBT](../TeleBT)
+ground statiion hardware product.
+
+## Where to Get It ##
+
+AltosDroid is availaable from the [Google Play](https://play.google.com/store/apps/details?id=org.altusmetrum.AltosDroid) store.
+
+## What It Can Do ##
+
+Current features include telemetry logging to SD card, text to speech 
+announcements of flight state, and downlink frequency selection.
+
+## Source Code ##
+
+The source to AltosDroid is part of the [AltOS](../AltOS) repository, 
+which is always available from [git.gag.com](http://git.gag.com) 
+in the project [fw/altos](http://git.gag.com/?p=fw/altos;a=summary).  
+
+## Future Plans ##
+
+Future features we plan to add include flight computer configuration support,
+Google Maps integration, and "take me to my rocket" navigation.
+

diff --git a/Radio/index.mdwn b/Radio/index.mdwn
index e08f6337bd6aac84e0d75826fb9a58e07c3d07f5..8a22d08213b6a1a9beb24f440c7592e3ed3b3db8 100644 (file)
--- a/Radio/index.mdwn
+++ b/Radio/index.mdwn
@@ -45,7 +45,9 @@ choice with questions taken from a pool that is completely published ahead
 of time, and there are some great online resources for learning the material
 and taking practice exams until you're ready to take the real test.  This 
 [ARRL page](http://www.arrl.org/FandES/ead/classes.html) is a good place
-to start.  
+to start.  We also have it on good authority that the book and iOS app 
+available from [Ham Radio School.com](http://hamradioschool.com) are pretty
+good.
 
 ## Operation in Other Countries ##