Merge branch 'master' into lost_gf

Zapaud · Jan 26, 2015 · e3329e2 · e3329e2
2 parents f20cda5 + 27a9dd6
commit e3329e2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/english/find-exit/chococopter/charlie/charlie.md b/english/find-exit/chococopter/charlie/charlie.md
@@ -0,0 +1,4 @@
+You follow the chocolate river to a boat where you find a whack-o guy who wants to take
+you on a boat ride with a bunch of small little orange people... 
+
+Right on !!! [have a great trip](https://www.youtube.com/watch?v=8X48RiKQmFQ) 
diff --git a/english/find-exit/chococopter/chococopter.md b/english/find-exit/chococopter/chococopter.md
@@ -14,4 +14,22 @@ chococopter moves in. The wind from the rotors blows the melty chocolate chip
 
 bullets away saving you from certain death. The chococopter wisks you away to a 
 
-submarine that is waiting nearby.  
+submarine that is waiting nearby.  
+
+You scamper quickly to the submarine for safety.  As you approach the craft you realize 
+
+that it is floating in a river of rapidly flowing chocolate apparently from all of the chocolate
+
+chip rain.  As you near the edge of river you further realize the craft you spotted was not
+
+a submarine but a finely tuned water craft piloted by a whacked out man and tiny orange men.  It
+
+is beginning to rain chocolate chips again...
+
+Do you?
+
+[Try to deflect the chocolate drops with your jar of peanut butter?](reeses/rpbc.md)
+
+or 
+
+[Seek safety on the chocolate water craft?](charlie/charlie.md)
diff --git a/english/find-exit/chococopter/reeses/rpbc.md b/english/find-exit/chococopter/reeses/rpbc.md
@@ -0,0 +1,3 @@
+You find yourself transported in time back to a 1980 TV commercial for Reese's Peanut Butter Cups.
+Take yourself back to a much simpler time when there were people on the street walking, over the head
+earphones and "Sony Walk-Mans" [enjoy this clip](https://www.youtube.com/watch?v=DJLDF6qZUX0)
diff --git a/espanol/canudos.md b/espanol/canudos.md
@@ -16,4 +16,6 @@ el Consejero:
 
 [Mandó a Beatito a buscar al cocinero](cocinero/cocinero.md)
 
-[Clavó sus ojos directamente sobre el Beatito...](rebelion/inicio-rebelion.md)
+[Clavó sus ojos directamente sobre el Beatito...](rebelion/inicio-rebelion.md)
+
+[Y entonces compro un dragon](dragon/dragon.md)
diff --git a/espanol/dragon/dragon.md b/espanol/dragon/dragon.md
@@ -0,0 +1,3 @@
+Para iniciar la batalla, tenía que conseguir un medio de transporte.
+Y este medio de transporte sería el Dragón Earhart, que compró al más famoso 
+vendedor de dragones del pueblo