Skip to content

Commit

Permalink
Merge pull request #1 from udacity/master
Browse files Browse the repository at this point in the history
Bring fork up to date
  • Loading branch information
jdhj authored Jun 27, 2016
2 parents cc5781f + 6bdf27a commit 0f3b148
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 3 deletions.
7 changes: 7 additions & 0 deletions Philippines/movie/movie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Mamili:

Manood ng captain america.

Manood ng avengers.

Nagbago ng isip at bumalik sa [choices] (../salamat.md).
2 changes: 2 additions & 0 deletions Philippines/salamat.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ Ipagpatuloy ang adventure [dito] (bago/bago.md).
Un oh. Nakapag-tagalog din. [Pindot Kalikot] (bago/bago.md)

Buksan ang [pinto] (bagong simula/bagong_simula.md).

Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md)
5 changes: 4 additions & 1 deletion english/coffee/chess/chess.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Drinking coffee excites your brain.
You feel like a mental challenge....
and look for a challenging chess game.
and look for a challenging chess game.

[How about a nice game of three-dimensional chess?](three-dimensional-chess/three-dimensional-chess.md)

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
You realize you don't have a three-dimensional chess set.
Maybe Amazon can deliver one today.

6 changes: 5 additions & 1 deletion english/forest/fire/woods/follow/follow.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
As you start to follow the shawman, you notice the bear behind you, drinking from the magical stream.
The bear is now twice as big, and looks angry.
You turn to ask for help from the shawman, but he's vanished.
You slowly turn to the bear, and feel a hot breath on the back of your neck.
You slowly turn to the bear, and feel a hot breath on the back of your neck.

Conjuring your new powers, you attempt to create a beehive full of honey to attract the bear.
Unfortunately you only manage to create the bees, now you can see them starting to swarm. A moment
later they are chasing you and the bear deeper in to the forest.
2 changes: 2 additions & 0 deletions german/schwimmen/schwimmen.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ Man sollte ...
... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht.
[Insel](insel/insel.md)

... dem Klang des rythmischen Trommelschlages folgen.[Trommeln](trommeln/trommeln.md)

[Zurück](../ruderboot.md)
9 changes: 9 additions & 0 deletions german/schwimmen/trommeln/trommeln.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Der rythmische Trommelklang hat die gestrandeten angelockt.

Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden.

Wilder Gesang einer fremden Sprache schallt ihnen entgegen.

Als sie die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick!

... doch die gehen wieder zurück zum [Strand](../schwimmen.md) von dem sie kamen
3 changes: 3 additions & 0 deletions swedish/midsommar/midsommar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Idag är midsommar! Du har inte köpt nån öl eller vin
eller SNAPS och Systemet är stängt.
Vad ska göra de små grodorna?
4 changes: 3 additions & 1 deletion swedish/somna-om/somna-om.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Du väljer att dra täcket över huvudet och somnar om,
men mardrömmen fortsätter och du drömmer nu om att...

[du äter en stor marshmallow...](../marshmallowen/marshmallowen.md)
[du äter en stor marshmallow...](../marshmallowen/marshmallowen.md)

[det är midsommar](../midsommar/midsommar.md)

0 comments on commit 0f3b148

Please sign in to comment.