From: Bdale Garbee Date: Sat, 3 Mar 2012 15:55:28 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com X-Git-Url: https://git.gag.com/?p=web%2Fgag.com;a=commitdiff_plain;h=5f808ecd6f812961a52f81a6670af833cc9dc90c;hp=9340c6ea6ff5ef5f25a26874e60c2e37c81f6ff1 Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com --- diff --git a/rockets/airframes/YikStik3/index.mdwn b/rockets/airframes/YikStik3/index.mdwn index 1bf293c..a0b565a 100644 --- a/rockets/airframes/YikStik3/index.mdwn +++ b/rockets/airframes/YikStik3/index.mdwn @@ -9,7 +9,7 @@ flight at LDRS 30. We recovered the nose cone, tail cone, rail buttons, and all of the electronics from 2YikStik. Everything else is new for this build. -Meanwhile, Robert became interested in measuring the temperature of a nose +Robert is very interested in measuring the temperature of a nose cone and a fin on a rocket at speeds above Mach. This led Bdale to design a [TeleMetrum](http://altusmetrum.org/TeleMetrum) companion board called [TeleScience](http://altusmetrum.org/TeleScience) capable of hosting up to