chore: Merge remote-tracking branch 'upstream/master'

Drithin · Drithin · commit 924238c2f596 · 2017-01-15T11:42:44.000-08:00
diff --git a/Chinese/seever/天河他娘.md b/Chinese/seever/天河他娘.md
@@ -0,0 +1 @@
+容貌美丑不过是表象,内里是没什么分别的,都是皮下白骨,生命如朝露,如此短暂,没必要在意这些表面的东西
diff --git a/Chinese/大话西游.md b/Chinese/大话西游.md
@@ -163,3 +163,5 @@
 [Js不可告人的秘密](Javascript/js.md)
 
 [wow](wow/wow.md)
+
+[天河他娘](seever/天河他娘.md)
diff --git a/catala/correr/correr.md b/catala/correr/correr.md
@@ -3,3 +3,7 @@ La ostia que et fots és de campionat!
 Que no saps que les parets no poden ser de núvol de sucre?
 
 És clar que no, si no les formigues t'entrarien a casa ;-P
+
+Què fas?
+
+[Et poses a buscar formigues](formigues/formigues.md)
diff --git a/catala/correr/formigues/formigues.md b/catala/correr/formigues/formigues.md
@@ -0,0 +1,5 @@
+Les petites formiguetes a l'estiu,
+quan el blat ja està segat, ben lligat i apilotat,
+surten arrengleredetes del seu niu, fent xiu-xiu, fent xiu-xiu...
+
+I et poses a fer-li pessigolles a la teva parella!
diff --git a/english/concert/concert.md b/english/concert/concert.md
@@ -1,3 +1,7 @@
 At the David Gray [concert](https://www.youtube.com/watch?v=uGm5z8sJAFM) you join the 
 crowd in a sick live mobile light-show and find a wizard to sell you that voodoo you needed 
-to find yourself with the [Neonic Lion](http://www.neonic-live.com/).
+to find yourself with the [Neonic Lion](http://www.neonic-live.com/).
+
+The laser-fueled haze in the distance catches your eyes.
+Spirit wild, trek in the general direction of your
+favorite [Music Festival](../music-festival/music-festival.md).
diff --git a/english/dance/dance.md b/english/dance/dance.md
@@ -17,6 +17,8 @@ But there are too many cooks!
 Or so you think. You're not sure because you are self-aware of your tendency to be 
 easily swayed by catchy rock songs of the 80s and Foreigner - Double Vision was just on the radio.
 
+You become other aware that a potential dance partner is making eye contact with you...
+
 Just get to sleep
 
 Dance Like MJ , live you life fully, 
@@ -42,6 +44,8 @@ it is a dancing cat
 
 [Want to read a story](../myStory/mayank.md)
 
+[Look for a dance partner!](https://www.youtube.com/watch?v=3O3NCfiLvqs)
+
 [Dance like it's 1999](https://www.youtube.com/watch?v=xWiUvn2KBu4)
 
 
diff --git a/english/forest/drag/drag.md b/english/forest/drag/drag.md
@@ -7,3 +7,5 @@ their venom. You die in even more pain than you were before.
 [Stay, don't move](stay/stay.md)
 
 [Morph into a hero named Snake Guy](snake/snake-guy.md)
+
+[You grab the skull laying beside](skull/skull.md)
diff --git a/english/forest/drag/skull/skull.md b/english/forest/drag/skull/skull.md
@@ -0,0 +1,3 @@
+As u pick up the skull a string detaches from it and suddenly everything turns black.
+
+As u regain vision u see youself in an empty white place with two paths.
diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md
@@ -13,6 +13,15 @@ But being this is a .44 Magnum, the most powerful handgun in the world, and
 would blow your head clean off, you've got to ask yourself one question: 
 'Do I feel lucky?' Well, do ya, punk?
 
+You think to your self...  
+
+"you know... I DO [feel LUCKY](lucky/lucky.md)" 
+
+OR
+
+"I've never been lucky... nothing ever goes right for me...  now I've got a gun
+pointed in my face put there by me!  This goes down as a pretty bad day."
+
 You're about to start talking to them, when you realize you can't actually open
 your mouth. It's kind of sealed. "What shall I do to communicate then?", you think:
 
diff --git a/english/friendly-person/lucky/lucky.md b/english/friendly-person/lucky/lucky.md
@@ -0,0 +1,31 @@
+... you know it's one of those days.  
+The sun is shining, 
+birds chirping in the trees, 
+slight fresh sented breeze
+... you know a bit like one of those Frebeeze commercials
+You knotice how the breeze feels good on your skin
+warmed by the late afternoon sun.
+Ahhhhh... nice to just be alive.
+
+Pretty lucky afterall.
+
+Well, except for this guy who looks like me with a gun in my face.
+
+But then again... your realize... this IS your lucky day.
+
+You smile.
+He smiles.
+
+You give a little chuckle
+He gives a little chuckle
+
+And in tha tinstant of mystical connection 
+togehter you come to the simultaneous conclusion that 
+you know what's really lucky?
+
+It's that you BOTH saved 15% on your car insurance by switching to GEICO.
+
+Ahhhhh
+so lucky.
+
+ 
diff --git a/english/love/love.md b/english/love/love.md
@@ -51,3 +51,9 @@ Love.
 
 PS: it's bullshit
 
+Love is dependent on the person.
+Each person can experience love in different ways.
+It does not always have to be with a person.
+Love can be a passion.
+But depending on the person.
+Love can be anything.
diff --git a/english/music-festival/lollapalooza-1997/lollapalooza-1997.md b/english/music-festival/lollapalooza-1997/lollapalooza-1997.md
@@ -0,0 +1,18 @@
+You leave work at Bell's Amusement Park in Tulsa OK and
+immediately drive non-stop to St. Louis.  The custom cherry
+red Datson 510 has no problem with the drive. 
+You crash on your sister's pull-out couch but can't sleep.
+You're too excited.
+
+Your day is a hazy blur of sight and sound.  The people are as
+deep as the sea.  In your fog you
+witness performances by:
+
+Orbital,
+Devo,
+The Prodigy,
+The Orb,
+Snoop Dog with Tupac,
+and the closing act, Tool
+
+Afterwards, you find yourself [holding the door](../../hold_the_door/hodor.md)
diff --git a/english/music-festival/music-festival.md b/english/music-festival/music-festival.md
@@ -0,0 +1,8 @@
+Welcome to the heart of your most fondly remembered music festival.
+You don't need a ticket.  You've been here before.
+
+Where are you?
+
+[Woodstock 1994](woodstock-1994/woodstock-1994.md)
+
+[Lollapalooza 1997](lollapalooza-1997/lollapalooza-1997.md)
diff --git a/english/music-festival/woodstock-1994/woodstock-1994.md b/english/music-festival/woodstock-1994/woodstock-1994.md
@@ -0,0 +1,13 @@
+You're trapped in a memory of Woodstock '94.  Were these your experiences,
+or do they belong to someone else... perhaps [many others](https://www.youtube.com/watch?v=Cz227EU_1mU)?
+
+You slide in the mud while being entertained by:
+
+[Blind Melon](https://www.youtube.com/watch?v=3xph8pPJMB8)
+
+[Primus](https://www.youtube.com/watch?v=v-HUK8qR9QA)
+
+[Nine Inch Nails](https://www.youtube.com/watch?v=3lbFfiLAj_A)
+
+Before your favorite band can play, you are
+back in [the forest](../../forest/forest.md) again.
diff --git a/english/start-dancing/startDancing.md b/english/start-dancing/startDancing.md
@@ -2,4 +2,6 @@ When the song finishes, you think it is a great idea to start a party for all th
 
 What do you serve to your guests at this party to end all parties?
 
+[smores](../smores/smores.md) (Yummy dance food!)
+
 [Hot fruit](../madness/cthulhu.md) (Hey, isn't the the bowl you mixed the glint in?)
diff --git a/german/Dorf/Schmiede/schmiede.md b/german/Dorf/Schmiede/schmiede.md
@@ -0,0 +1,2 @@
+Vorsichtig pirschen Sie sich an das uralte Schmiedgebäude heran, aus dessen
+Schornstein dichte Rauchwolken hervorquellen.
diff --git a/german/Dorf/dorf.md b/german/Dorf/dorf.md
@@ -24,4 +24,6 @@ Nach dem Festmachen gehen sie zu/zum/zur:
 
 [Tempel: Ein mystisch aussehendes Grundstück](Tempel/tempel.md)
 
+[Schmiede: Ein düsteres Handwerksgebäude am Rande des Dorfes](Schmiede/schmiede.md)
+
 [Werft: Ein Handwerksgebäude am Wasser mit einer Art Ablaufbahn](Werft/werft.md)
diff --git a/korean/filibuster/filibuster.md b/korean/filibuster/filibuster.md
@@ -1 +1,3 @@
-필리버스터 중인 국회의원을 응원하다가, 배가 고파 [마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) 
+필리버스터 중인 국회의원을 응원하다가, 배가 고파 [마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) 
+
+[자랑하고 싶어서 인스타그램에 인증샷을 올린다.](../instagram/insta.md)
diff --git a/korean/marshmallow.md b/korean/marshmallow.md
@@ -49,3 +49,5 @@
 [화장실에 간다] (restroom/restroom.md)
 
 [인스타그램에 인증샷을 올린다] (instagram/insta.md)
+
+[게임을 시작한다] (playgame/playgame.md)
diff --git a/korean/playgame/playfm/playfm.md b/korean/playgame/playfm/playfm.md
@@ -0,0 +1,13 @@
+﻿당신은 fm을 시작했습니다.
+
+이제 당신은 6부리그 감독입니다. 1부리그로 승격하기 전 까지 게임에서 나올 수 없습니다.
+
+엄청난 노력끝에 당신은 팀을 1부리그까지 승격 시켰고 결국 우승컵을 들어올렸습니다.
+
+축하합니다.
+
+우승후 정신을 차려보니 1년이 지났습니다. 이제 어떻게 할까요?
+
+[다른 게임을 찾아본다] (../playgame.md)
+
+[처음으로 돌아가서 다른것을 한다.] (../../marshmallow.md)
diff --git a/korean/playgame/playgame.md b/korean/playgame/playgame.md
@@ -0,0 +1,7 @@
+﻿컴퓨터 앞에 앉았습니다. 무슨게임을 시작할까요?
+
+[아니야 그냥 게임말고 다른거 할래] (../marshmallow.md)
+
+[FM을 시작한다] (playfm/playfm.md)
+
+[그냥 카카오TV를 본다] (watchkakaotv/kakao.md)
diff --git a/korean/playgame/watchkakaotv/kakao.md b/korean/playgame/watchkakaotv/kakao.md
@@ -0,0 +1,15 @@
+﻿게임이 지겨웠던 당신
+
+직접 플레이보다는 게임 하는것을 보기로 결정했습니다.
+
+베스트PD와 추천PD를 돌아 가면서 즐겁게 방송을 보았습니다.
+
+잠깐 정신을 차려보니 1개월이 지나있었고 당신은 팟수가 되었습니다.
+
+당신은 이선생방의 네임드이고 멍구누나방의 전문 어그로꾼이 되었습니다.
+
+더 이상 이렇게 살 수 없다고 생각한 당신 이제 어떻게 할까요?
+
+[다른 게임을 찾아본다] (../playgame.md)
+
+[처음으로 돌아가서 다른것을 한다.] (../../marshmallow.md)
diff --git a/portugues/barata/Pedro/pedro.md b/portugues/barata/Pedro/pedro.md
@@ -0,0 +1,4 @@
+Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me defender. 
+Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me defender.
+
+Ele vai dar uma vassourada na barata dela. ( x4 )
diff --git a/portugues/barata/baratadavizinha.md b/portugues/barata/baratadavizinha.md
@@ -17,4 +17,6 @@ a barata da vizinha está na minha cama.
 
 [Diz aí Biluguinha o que "cê" vai fazer:](Biluga/biluga.md)
 
+[Diz aí Biluguinha o que "cê" vai fazer:](Pedro/pedro.md)
+
 E vc? O que "cê" vai fazer?

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+容貌美丑不过是表象,内里是没什么分别的,都是皮下白骨,生命如朝露,如此短暂,没必要在意这些表面的东西`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+As u pick up the skull a string detaches from it and suddenly everything turns black.`
	`2`	`+`
	`3`	`+As u regain vision u see youself in an empty white place with two paths.`