Merge branch 'master' into master

Author: weerox

steps/03-03-or.html

@@ -4,34 +4,35 @@
 lang: en
 ---
 <p>
-  The following poem "Ottos Mops" is by Ernst Jandl.
-  Find all words which begin with <span class="regex">f</span> or <span class="regex">k</span>.
+  The following poem <a href="http://www.signandsight.com/features/290.html">"fritz's bitch" is by Brian Murdoch</a>.
+  It is a translation of Ernst Jandl's "Ottos Mops".
+  Find all words which begin with <span class="regex">s</span> or <span class="regex">i</span>.
 </p>
 <div class="playfield">
   <!-- needs attention -->
-  <input type="text" value="" class="regex" reference=" f| k">
+  <input type="text" value="" class="regex" reference=" s| i">
   <div class="message"></div>
   <ul class="examples">
-    <li>ottos mops trotzt</li>
-    <li>otto: fort mops fort</li>
-    <li>ottos mops hopst fort</li>
-    <li>otto: soso</li>
+    <li>fritz's bitch itches</li>
+    <li>fritz: quit bitch quit</li>
+    <li>fritz's bitch quits it</li>
+    <li>fritz: nitwit</li>
     <li></li>
-    <li>otto holt koks</li>
-    <li>otto holt obst</li>
-    <li>otto horcht</li>
-    <li>otto: mops mops</li>
-    <li>otto hofft</li>
-    <li>
-    <li>ottos mops klopft</li>
-    <li>otto: komm mops komm</li>
-    <li>ottos mops kommt</li>
-    <li>ottos mops kotzt</li>
-    <li>otto: ogottogott</li>
+    <li>fritz picks chips</li>
+    <li>fritz picks chips</li>
+    <li>fritz listens</li>
+    <li>fritz: bitch bitch</li>
+    <li>fritz wishes</li>
+    <li></li>
+    <li>fritz's bitch twitches</li>
+    <li>fritz: sit bitch sit</li>
+    <li>fritz's bitch sits</li>
+    <li>fritz's bitch is sick</li>
+    <li>fritz: shitshitshit</li>
   </ul>
 </div>
 <p class="hint">
   <!-- Hint still in German -->
-  Das <span class="regex">f</span> is mitten im Wort <span class="regex">hofft</span>.
-  Verwende Leerzeichen, um den Wortanfang zu finden.
+  The <span class="regex">i</span> is in the middle of the word<span class="regex">nitwit</span>.
+  Use spaces to find the beginning of the word.
 </p>