Skip to content

Commit

Permalink
Merge pull request #1 from udacity/master
Browse files Browse the repository at this point in the history
Update my fork
  • Loading branch information
Stanley Mwangi committed May 2, 2015
2 parents 8bb76c4 + d1e0179 commit 643e277
Show file tree
Hide file tree
Showing 208 changed files with 1,284 additions and 54 deletions.
3 changes: 2 additions & 1 deletion Chinese/CrazyStone/CrazyStone.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
国际大盗麦克,受雇来到重庆抢夺一块翡翠。除了保安,他还要面对当地的三名小贼。为了得到这块翡翠,
他打算挖地洞进入藏宝地点,说起挖地洞,现在问题来了。
他没学过挖洞的技能,况且手头也没有工具,独自一人徒手挖洞显然无法想象。正在他抓耳挠腮绞尽脑汁的紧要关头,上天灵光突然照亮了他的脑袋---要挖洞,找蓝翔!!!
麦克二话不说,径直奔向重庆火车站。此时正值春运,麦克排了三天三夜,终于轮到自己却被告知开往山东的火车票都已售罄……麦克心灰意冷地走出火车站,却意外撞见了小贼中的一名,原来他也没买到去蓝翔的火车票。
麦克二话不说,径直奔向重庆火车站。此时正值春运,麦克排了三天三夜,终于轮到自己却被告知开往山东的火车票都已售罄……麦克心灰意冷地走出火车站,却意外撞见了小贼中的一名,原来他也没买到去蓝翔的火车票。两人一阵唏嘘,
相见恨晚,大排档喝到半夜。第二天早上6点麦克被广场舞震醒,发现自己一个人躺在床上。
13 changes: 12 additions & 1 deletion Chinese/Lady/Lady.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
话说悟空终因顽劣不化而被罚重入轮回。
不想这个平日不近女色的猴子竟托生成了凤姐……
更巧的是……她与八戒产生了一段不得不说的故事……
更巧的是……她与八戒产生了一段不得不说的故事……

八戒此时已经是净坛使者,每天的日子悠哉悠哉。
终日辗转于各个寺庙,过着一个吃货梦想的生活。
这一天,八戒来到了辽西的著名寺庙,奉国寺。
听说这个寺庙信众颇多,想必好吃的也会不少。
天知道,悟空转世的凤姐正好在此时来烧香礼佛。
凤姐的气场是众所周知的强悍。
而八戒的审美又是得天独厚的独特。
这一章正是:
凤姐初来奉国寺
八戒又成多情种
3 changes: 3 additions & 0 deletions Chinese/Xinyang/MyLoveStory.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
至尊宝:姑娘,我发表人生感悟你为何总是喋喋不休?月光什么光什么宝什么盒,我根本听都
没有听说过。姑娘,你还是不要打扰我感悟人生的真谛了吧。
姑娘:人家哪有嘛?
5 changes: 4 additions & 1 deletion Chinese/ZZB/zzb.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
至尊宝:谁说我斗鸡眼?我只是把视力集中在一点,以改变我以往对事物的看法!

If you speak English, [go here](../../english/marshmallow.md).
紫霞仙子继续说:

[你可知月光宝盒?](../Xinyang/MyLoveStory.md)

1 change: 1 addition & 0 deletions Chinese/Zhou/Zhou.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
周星驰有一天突然觉得自己上辈子是孙悟空,所以在大话西游中出演了这一角色.
4 changes: 3 additions & 1 deletion Chinese/congrats/congrats.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
恭喜您已經被選中參加我們的年度訪客意見調查。
完成後,您將有機會獲得一台Macbook Air, iPhone 7, 或iPad Air 3。
完成後,您將有機會獲得一台Macbook Air, iPhone 7, 或iPad Air 3。

[請提供您的資料](give-personal-info/give-personal-info.md)
1 change: 1 addition & 0 deletions Chinese/congrats/give-personal-info/give-personal-info.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
請提供您的姓名,出生日期,血型,身高,體重。
4 changes: 3 additions & 1 deletion Chinese/大话西游.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@

[校园偶像](school-idols/school-idols.md)?

[Baymax](Baymax/Baymax.md) ?
[Baymax](Baymax/Baymax.md) ?

[周星驰](Zhou/Zhou.md) ?
3 changes: 2 additions & 1 deletion Italian/caramelle.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Una mattina, ti svegli in una strana stanza.
Che stai facendo?
Che fai?

[Torno a dormire](domire/sogno-strano.md)

[Cerco l'uscita](scappare/cercare-uscita.md)

[Apro la finestra](finestra/apri.md)

2 changes: 2 additions & 0 deletions dutch/bos/donker-bos.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ In het donkere bos aangekomen, hoor je plotseling stemmen.
Je verstaat geen woord ervan, maar de stemmen komen wel steeds sneller naar je toe.

Je verstopt je in de struiken, en ziet twee mannen met een lijkzak sleuren.
De grootste kijkt achterdochtig op als er een vogel opvliegt uit een boom vlak bij je schuilplaats.

Je gaat snel [terug naar de hei](../welkom.md)

Je blijft stiekem [meekijken](ontvoering/ontvoering.md)

5 changes: 5 additions & 0 deletions dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
In eerste instantie geloven de mannen je niet maar als ze je Rolex om je arm
zien zijn ze snel geïnteresseerd. Wie is deze man?

De mannen kijken elkaar aan en na een korte blik vraagt de langste man:
Voor wie werk jij dan eigenlijk en heb je nog meer klussen?
5 changes: 4 additions & 1 deletion dutch/bos/ontvoering/meehelpen/meehelpen.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ De mannen accepteren argwanend je hulp.

Een sterke man kunnen ze goed gebruiken omdat de lijkzak erg zwaar is.

Ze houden je goed in de gaten, hoe red je je nou uit deze situatie?
Ze houden je goed in de gaten, hoe red je je nou uit deze situatie?

Je maakt een slechte grap over de vorige man die je zo versleept hebt en hoe
goed die [klus](klus/geld-verdienen.md) betaalde.
15 changes: 15 additions & 0 deletions dutch/over-het-hek/hek.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
... vol overgave neem je een aanloop en springt over het hek. Met een elegante zwaai vlieg je eroverheen.

Nou ja... bijna dan. Net voordat je voeten de grond raken kom je plots tot stilstand.
De tranen springen je in de ogen, want het gevoel van hoe je kleren plotseling
in je vel knijpen is niet bepaald prettig.

Terwijl de pijn langzaam wegebt, besef je wat er aan de hand is. Je zit vast!

Je zoekt naar hulpmiddelen om los te komen in je zakken en ... wat vind je?

[Het mobiel dat je eerder gevonden had](mobiel/mobiel.md)

[Wat onbekende paddestoelen; terwijl je verder droomt eet je ze op](hek.md)

[Je autosleutel](sleutel/sleutel.md)
2 changes: 2 additions & 0 deletions dutch/over-het-hek/mobiel/mobiel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Je druk op het knopje van je mobiel, het scherm licht nog even op en...

4 changes: 4 additions & 0 deletions dutch/over-het-hek/sleutel/sleutel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Tja wat moet je nu met een sleutel... Nu ja, je zit geen andere mogelijkheid dan
toch het kledingstuk waaraan je hangt langzaam kapot te schuren met de sleutel.

Geheel verdiept in het schuren en scheuren merk je pas langzaam op dat...
4 changes: 3 additions & 1 deletion dutch/welkom.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ U denkt

... in het [bos](bos/donker-bos.md) daarginds is vast koeler.

... niet naar het bos! U heeft het gevoel dat daar iets niet pluis is...
u keert uw rug naar het bos en nu ziet u een hek. Daar [klimt u overheen](over-het-hek/hek.md).


[Google translate NL](https://translate.google.com/#nl/en/)

Terug naar [taalkeuze](../language.md)
Terug naar [taalkeuze](../language.md)
7 changes: 6 additions & 1 deletion english/adipose/adipose.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ You die from fat drain.

You are absorbed into the marshmallow wall and now you wait with the others for new recruits.

You emerge from the wall a marshmallow human. YOu now resemble the michelin man.
You emerge from the wall a marshmallow human. You now resemble the Michelin man.

As you ponder your place in the universe, you feel a slight fire under your
feet and begin to worry... "Am I a human dreaming I'm a marshmallow being
roasted alive, or am I a marshmallow being roasted alive who awoke from a dream that I
was a human?"
3 changes: 2 additions & 1 deletion english/amnesia/amnesia.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ skin creep. I can't get no sleep.
I try some tea, it gets me nowhere.
It's probably because the marshmellows where filled with horse hooves
It's definitely throwing off my groove:(
Then I open my mac and log on to udacity :)
Then I open my mac and log on to udacity,
All I see are lessons that can help me :)

[Sit back down, to get no sleep?](../sleep/marshmallow.md)

Expand Down
10 changes: 10 additions & 0 deletions english/ask-to-alice/ask-to-alice.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
She say to you that you need to talk with hookah smoking caterpillar because he has
all your answers.

But how can you believe anyone who stands 10 ft tall holding a white rabbit? What is that
[music](https://www.youtube.com/watch?v=WANNqr-vcx0) that you're hearing? You decide to that
it's time for another pill, but which one should you take?

[The one that makes you larger](../super-man/save-the-word.md)

[The one that makes you sleep](../sleep/marshmallow.md)

[The one that your mother gave you that doesn't do anything](./ask-to-alice.md)
4 changes: 3 additions & 1 deletion english/bake-cookies/cookies.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ Do you:

[Invite friends to share?](../invite-friends/friends.md)

[Sing a song?](../sing-song/sing.md)
[Sing a song?](../sing-song/sing.md)

[Make coffee first?](../coffee/coffee.md)
2 changes: 1 addition & 1 deletion english/call-a-doctor/doctor.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ As you exhale, the walls stiffen, becoming less like marshmallow, and more like
the interior of your cell. The walls are a toasted-marshmallow kind of dirty white
color, not like the institutionalized white you remember from movies.

The doctor enters.
[The doctor](https://www.youtube.com/watch?v=WsGDvMqcP94) enters.

["Let me outta here, Doc!!!"](let-me-out/let-me-out.md)

Expand Down
23 changes: 23 additions & 0 deletions english/candyland/diabetes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
You light a small fire in the middle of the marshmallow room.

As the fire grows, a sweet aroma fills the room and the ceiling
becomes ever so slightly brown just above the fire.

The marshmallow room started melting and you started seeing some
colorful lights shining through.

Wait! But this is not any colorful lights you are seeing! What
appears before you is a rainbow colored Gumdrop Mountains!

Surrounding the Gumdrop Mountain are acres of Lollipop Woods where
there's a forest of giant lollipops as tall as sequoia.

You wanted to taste all these sweetness around you, but damn you
just realize you have diabetes.


[Magic](magic/magic.md)

[Taste The Rainbow](rainbow/rainbow.md)

[Inspect The Melted Marshmallow](swim/swim.md)
4 changes: 4 additions & 0 deletions english/candyland/magic/magic.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Channel you inner Harry Potter and turn that rope into some graham crackers.
Grab you a handfull of that marshmallow wall.
Use that lighter and make you some smores.
Eat your way out of that room and watch out for Lord Voldemort
20 changes: 20 additions & 0 deletions english/candyland/rainbow/rainbow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
As you look, you realize the colored lights from the GumDrop mountain are
coming closer.

They swoop down in magnificent rainbow style and land directly at your feet.

Reaching out and touching the rainbow you see it's not actually light at all. It's more candy!

Wondering what the rainbow taste like, your desire overcomes any concerns about diabetes.

You lean forward, close your eyes, and lick across all the colors of the rainbow.

Instead of the usual flavors they taste gross.

Yellow taste like barf, and green taste like boogers.

You remember your past and feel ashamed you know what those taste like.

You begin to cry uncontrollably.


19 changes: 19 additions & 0 deletions english/candyland/swim/swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
You walk over and try to stand in the melted marshmallow.

You realize that it doesn't feel like marshmallow at all.

It is not sticky and in fact is quite milky smooth.

You lean forward and lick the frothy concoction.

Your mouth is filled with a sweet sugary creamy sweet delight.

You start to realize the milk is getting very cold and deep.

The viscous icy chunky liquid is now up to your chin so you begin to move your limbs to stay afloat.

You are now treading milkshake.

You see an ominous looking picture on the wall with a Queen standing by a sign in front on a sea.

The sign in the picture says: "The Ice Cream Sea"
5 changes: 5 additions & 0 deletions english/check-your-phone/check-your-phone.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
Pull out your phone to check the date and see where you are.
You can't help but notice that she hasn't called. Will this love survive?

You remember hearing somewhere that you can't read in a dream.
As you look at your phone, you realize that you can't make
out what it says....

You look up and suddenly, there is a woman in front of you
who says "You are on vacation in Paris!"

Do you:

[Decide this is just a dream and buy a t-shirt from CustomShirts.com] (http://CustomShirts.com)
Expand Down
2 changes: 2 additions & 0 deletions english/coffee/coffee.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Drink some coffee and relax yourself a little bit.

The bitter-sweet flavor of roasted coffee beans invigorates your soul.

You feel like a new person after a cup of coffee.

After having your coffee do you want to:

[Have another cup of coffee?](another-coffee/another-coffee.md)
Expand Down
1 change: 1 addition & 0 deletions english/coffee/cookie/Swim/swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
the swim refresses you and makes you feel fresh and rejuvenated.
1 change: 1 addition & 0 deletions english/coffee/cookie/Walk/walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
the walk opens up your mind and lets your creativity flow.
6 changes: 6 additions & 0 deletions english/coffee/cookie/bake-cookies.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ You satiate yourself with a pan
full of freshly baked cookies.

Yum.

After having coffee and cookies, you would want to:

[Go for a walk](Walk/walk.md)

[Go for a swim](Swim/swim.md)
9 changes: 9 additions & 0 deletions english/coffee/nude-run/badger/badger.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
At first, the badger does not react.

Finally, the badger blinks once, then looks down at itself.

"And so it is," the badger says, rather matter-of-factly.

Tearing off its fancy clothes, the badger thanks you for
reminding it that it's never too late to free oneself of the
chains of expectation, and promptly flies away.
28 changes: 28 additions & 0 deletions english/coffee/nude-run/cold-water/cold-water.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"Cold?!" the badger exclaims. Setting down the pen and the pad,
the badger stands from the chair, scratching at the back of its
head.

"I suppose," the badger whispers at last, "that even in the light
of day, the Fundamental Truth can elude me."

This badger is really pissing you off. Why is he saying such
stupid enlightend crap like this? You are furious that he could
be so pretentious. What a piece of work.

The badger notices your frustration, and starts to assume a
defensive pose. Honey badger's kick ass, you remember.

You suddenly notice the .38 magnum lying on the ground in front of you.
It looks like there is one bullet left. locked and loaded.

Unfortunately the badger noticed the gun as well. The gun is closer
to you, but not by much. You might be able to grab it, But you are not
sure how quick the badgers reflexes are.

What do you do?

["Strangle the badger with your hands"](../cold-water/strangle/strangle.md)

["Make a move for the gun"](../cold-water/grab-gun/grab-gun.md)

["Run away"](../cold-water/run-away/run-away.md)
18 changes: 18 additions & 0 deletions english/coffee/nude-run/cold-water/grab-gun/grab-gun.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
You lunge for the gun.

But the badger has much quicker reflexes than you expected,
and he runs for the gun as well, beating you to it.

The gun is too big for him, obviously, and doesnt have the
manual dexterity to pick it up and shoot you with it. As he
fumbles with the gun, BANG! He shoots himself in the heart.

Chunks of badger start falling all around you.

You can't help but chuckle.

'Cocky basterd.' You say, as you walk away and take out a
cigarette. As you light it, you remember another lesson from
your younger sunday school days:

pride goeth before the fall.
8 changes: 8 additions & 0 deletions english/coffee/nude-run/cold-water/run-away/run-away.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
You decide to run for it.

You tried so hard, and got so far. But in the
end, it doesn't even matter. You had to fall
to lose it all, but in the end, it doesn't even
matter.

Because that badger s-o-b outruns you and kills you.
13 changes: 13 additions & 0 deletions english/coffee/nude-run/cold-water/strangle/strangle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
You decide to forget the gun and go for the badger with
your bare hands, mano y mano. As god intended.

You reflect on how awesome you are, and that Nick
Offerman might be proud of how manly you are acting.

Unfortunately, the badger is superior in every way,
and before you're hands get near him, he starts biting
your face off. Literally.

As you lay dying, you realize the one lesson you forgot to
remember: Honey Badger don't care, Honey Badger get's what
it wants.
Loading

0 comments on commit 643e277

Please sign in to comment.