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

Drithin · Drithin · commit 20adc59354df · 2017-01-11T10:08:11.000-08:00
diff --git a/english/Soccer/soccer.md b/english/Soccer/soccer.md
@@ -1 +1,3 @@
 The very first question you should ask yourself is about the position you want to play.
+
+If you want to score goals, you would probably be a Striker.
diff --git a/english/bear-story/bear-story.md b/english/bear-story/bear-story.md
@@ -7,3 +7,6 @@ another fantasy world as her bear slave.
 You end up in the body of a 10-year-old and are 
 forced to participate in the bear takeover of the world!
 
+This is the price you pay when you lock eyes with a
+dancing bear.
+
diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md
@@ -6,3 +6,5 @@ would you like to [sing](../sing/sing.md)?
 would you like to [play](../play-music/playmusic.md)?
 
 Or maybe you'd like to [drive the cat to your sisters house](../dog-person/dog.md)?
+
+How about talking to someone from beyond the [grave](../call-spirit/call-spirit.md)?
diff --git a/english/cricket/if-you-love-cricket/ifyoulovecricket.md b/english/cricket/if-you-love-cricket/ifyoulovecricket.md
@@ -0,0 +1 @@
+Love cricket? [Go Here!!](../cricket.md).
diff --git a/english/marshmallow.md b/english/marshmallow.md
@@ -1,5 +1,7 @@
 Once upon a time many authors collaborated to make meaningless linked story.
 
+And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md)
+
 A few learned to [tango](tango/tango.md)
 
 Some preferred to
@@ -32,6 +34,10 @@ Which way should you go? Only you can decide.
 
 Oh so many decisions - what will you do??
 
+In the end you will realize that it [doesn't really matter]
+(https://goo.gl/1fd4wU).
+The path you choose is as good as any.
+
 You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)!
 
 [Build time machine](time-machine/time-machine.md)
@@ -1230,4 +1236,6 @@ Why are you reading this line? smile and move on.
 
 Smile and move on gingerly.
 
+What is your [passion?](passion/passion.md)
+
 -
diff --git a/english/passion/passion.md b/english/passion/passion.md
@@ -0,0 +1,9 @@
+Passion makes the old medicine new:
+Passion lops off the bough of weariness.
+Passion is the elixir that renews:
+how can there be weariness
+when passion is present?
+Oh, don't sigh heavily from fatigue:
+seek passion, seek passion, seek passion!
+
+Rumi
diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md
@@ -34,4 +34,6 @@ Que faites-vous ?
 
 [Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md)
 
-[Je ne fais rien](rien/rien.md)
+[Je ne fais rien](rien/rien.md)
+
+[Je commande du foie gras](foie-gras/foie-gras.md)
diff --git a/french/foie-gras/foie-gras.md b/french/foie-gras/foie-gras.md
@@ -0,0 +1,3 @@
+Quoi de mieux pour accompagner le pain d'épice que le foie gras ?
+
+Cherchez un livreur de foie gras et comandez un kilogramme pour chaque mur. N'oubliez pas d'inviter vos amis !
diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md
@@ -6,4 +6,6 @@ Maintenat que vous etes dehors, quoi faire?
 
 [Je sens des fleurs](sentir/fleurs.md)
 
+[Je reste là, on est bien là](./frapper-le-mur.md)
+
 [Il fait froid. Je rentre](../feu-de-camp.md)
diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md
@@ -31,4 +31,31 @@
 
 पहलवान: पास बनवा रखा है, इसीलिए नहीं लेता।
 
-कुछ बातें दिल पे नही लेनी चाहिए!! 😀 😛
+कुछ बातें दिल पे नही लेनी चाहिए!! 😀 😛
+
+******************************************
+
+Ek Hyderabadi banda apne mohalle key logann se bolta hain
+"Muzhe char logan ki talash hain
+Bachpanmain main jab school nahin jata tha
+toh ammi bolti thi ki beta school nako gayo toh
+char logan kya bolangey!
+fir thoda jab bada huan 
+toh ammi boli ki betay acche marks lao varna
+char logan kya bolangey!
+fir thoda aur bada hone par abba bole ki 
+baba acchi naukri karo
+varna char logan kya bolangey!
+fir uske baad jab shaadi ki umaar ho gayee
+toh bole bete pasand ki shaadi nahin karo
+varna char logan kya bolangey!
+fir uske baad jab bole bete biwi key saath akele raat main nakko jau
+varna char logan kya bolangey!
+
+please muzhe en char logann ki talash hain
+please enka pata bata do... yeah char loganne meri
+zindagi bachpan se ab tak baingan main mila de rehe
+varna enkay bolney ka khauff hamesha bana rahega!"
+ 
+
+

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`The very first question you should ask yourself is about the position you want to play.`
	`2`	`+`
	`3`	`+If you want to score goals, you would probably be a Striker.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Love cricket? [Go Here!!](../cricket.md).`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Quoi de mieux pour accompagner le pain d'épice que le foie gras ?`
	`2`	`+`
	`3`	`+Cherchez un livreur de foie gras et comandez un kilogramme pour chaque mur. N'oubliez pas d'inviter vos amis !`