Merge conflict in rocket.py resolved

Author: JdeH

SimPyLC/simpylc_howto.html

@@ -626,9 +626,9 @@ <h1><a name="_Toc508123208">Installation</a></h1>
       as explained on&nbsp;<span lang=NL style='color:windowtext'><a
       href="http://freeglut.sourceforge.net/index.php#download"><span
       lang=EN-US>http://freeglut.sourceforge.net/index.php#download</span></a></span></li>
-  <li class=MsoNormal style='color:black;line-height:normal'><span lang=NL>Type:&nbsp;</span><code><span
-      lang=NL>brew </span></code><span style='color:windowtext'>install
-      freeglut</span></li>
+  <li class=MsoNormal style='line-height:normal'><span lang=NL
+      style='color:black'>Type:&nbsp;</span><code><span lang=NL
+      style='color:black'>brew install freeglut</span></code></li>
  </ol>
  <li class=MsoNormal style='color:black;line-height:normal'>Install the XQuartz
      X-window system from&nbsp;<span lang=NL style='color:windowtext'><a

SimPyLC/~$mpylc_howto.html

@@ -288,7 +288,7 @@ def sweep (self):
         self.angVelocZ.set (self.angVelocZ + self.angAccelZ * world.period)
         angVelocVec = radiansPerDegree * numpy.array ((self.angVelocX (), self.angVelocY (), self.angVelocZ ()))
 
-        # Integration of rotation
+        # Actual integration over one timestep
         # Source: Friendly F# and C++ (fun with game physics), by Dr Giuseppe Maggiore and Dino Dini, May 22, 2014
         if useQuaternions:
             # Quaternions are much more numerically stable