Skip to content

Commit

Permalink
chore: Merge remote branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Drithin committed Jan 6, 2017
2 parents 5c89306 + 0957cab commit 2f442bb
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ Her hand moves to reveal a tiny marshmallow. "Think about it," she urges before
Do you ...

[Hightail it to the marsh?](go-to-marsh/go-to-marsh.md)

[Rush to a Malo concert?] (go-to-malo/go-to-malo.md)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
You arrive at the Malo concert, certain that a bad pun was what the waitress meant by her cryptic clue.
You search the room for something, anything, that will give meaning to this story...

The music is horrible, and you die.

...

You wake up in your bed. It's sunday morning, and you mom has made you blueberry pancakes.
You eat them and get ready for church.
Man, dreams are weird!
22 changes: 21 additions & 1 deletion english/dance-randomly/dance-randomly.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,24 @@ You catch yourself smiling, ever so brightly.

And oh yeah... how could you have forgotten?... life... it's beautiful!

It only makes sense that next, you...
It only makes sense that next, you...

Get inspired to finally do all those things you have been long contemplating...

Get that crazy haircut...change your look.

Quit that boring, unchallenging safe job and learn something new...
...don't feel ashamed to start at the bottom.

Learn that new language....

Take a 6 month break to just travel...meet new people...try new things.

Tell those who value - why they are such an important part of your life.

Thank those you take for granted...

Live the new life you just found with the wonder, enthusiasm and zeal of a 2 yr old...

Exactly like its supposed to be lived!!!

2 changes: 2 additions & 0 deletions english/iot/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ automobiles, buildings - embedded with sensors and powerful electronic circuits
powered by intelligent code that enable them to talk to each other without human
interference.

Click [here](https://en.wikipedia.org/wiki/Internet_of_things) for iot wiki.

The story begins here ...

The Internet of Things(IoT) is a new digital world that has a varied population.
Expand Down
21 changes: 21 additions & 0 deletions english/luck/grateful-man-bear-pig.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
As the shards of shattered mirror cascade to the ground, the Man-Bear-Pig's void-like
eyes appear to dance with an inner light, while the grotesque folds of its snout seem
to contort into a configuration that could charitably be described as a smile.

"Finally, you have banished the fork from my domain!" exults the Man-Bear-Pig. "Come!
Let me embrace you and adore you to the full measure of your merit."

The bulk of the Man-Bear-Pig looms over you, and it's colossal, hair, trottered arms
enfold you ineluctably.

You remain in this hug of horrors until you forget you ever had any other existence.
The Man-Bear-Pig croons continually over you, periodically breaking and re-breaking
each of your ribs as it squeezes you tighter and tighter over the months and years.
You are compelled to sustain yourself by suckling the rancid, faintly mayonnaise-
tasting milk of the Man-Bear-Pig's anatomically inexplicable teats.

Though you lose all track of time -- of even the concept of time, and indeed of space
and hope and beauty and pretty much all concepts other than that of the Man-Bear-Pig's
abominable embrace -- eventually seven years have passed. The Man-Bear-Pig releases
you, smiles -- if it is a smile -- down upon you affectionately, and lumbers away. You
collapse onto a scattering of mirror fragments.
1 change: 1 addition & 0 deletions english/tiger-attack/tiger-attack.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The tigers come charging at me full speed. They are after the lemonade, I just know it.
4 changes: 3 additions & 1 deletion english/use-the-fork-luke/use-the-fork.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,6 @@ You scream out of fright, and notice the reflection of the hippy holding a large
blue fork in the mirror next to you, even though there is no one else in the room!
He gestures for you to reach towards the mirror!

[Reach towards the mirror...](../virtualreality/oculus.md)
[Reach towards the mirror...](../virtualreality/oculus.md)

[Smash the mirror...](../luck/grateful-man-bear-pig.md)
6 changes: 6 additions & 0 deletions english/weed/weed.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@ Decide to go to [sleep] instead?(../sleep/marshmallow.md)

Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md)

Choose [Blue Pill](https://www.youtube.com/watch?v=1GFkN4deuZU)

Or

Choose [Red Pill](https://www.youtube.com/watch?v=1EdUjlawLJM)

Go [back to the room]?(../marshmallow.md)
6 changes: 5 additions & 1 deletion english/zoo/zoo.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals
I was pretty thirsty. There is a lemonade stand over there.
I head over and buy some [lemonade](../drink/lemonade/lemonade.md)

I choose to get better at [English](../get-better-at-english/english.md)
I choose to get better at [English](../get-better-at-english/english.md)

After my self trolling is complete, I decide to drink the lemonade.
As I lift the lemonade to my mouth I see the tigers have broken loose.
[tiger-attack](../tiger-attack/tiger-attack.md)
5 changes: 5 additions & 0 deletions russian/vegetarian/vegetarian.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Вы понимаете что Вы немного устали от всего этого хипстерского антуража и решаете стать вегетарианцем.
Тем более что сегодня дома нет ни грамма мяса. "Ладно, я слишком стар для похода в магазин и побуду
вегетарианцем недельку" - думаете Вы. Неделя проходит и Вам начинает нравиться новое состояние.
Спасаешь человечество опять же. Так уж и быть, Вы сдаетесь и начинаете называть себя вегетарианцем
прилюдно.
2 changes: 2 additions & 0 deletions russian/zefir.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,5 @@
[Наделаю селфи](selfie/make_selfie.md)

[Зайти на двач](2ch/2ch.md)

[Стану вегетарианцем](vegetarian/vegetarian.md)

0 comments on commit 2f442bb

Please sign in to comment.