chore: Merge remote branch

Drithin · Drithin · commit 68fe6368de40 · 2017-01-08T16:53:33.000-08:00
diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md
@@ -25,4 +25,6 @@ Or, it can be highly... oh, I forgot what I was going to say.
 
 Who am I?  Where am I?  What am I doing?
 
+My name is...I am Daniel.
+
 All your quesions can be answered by going [here](https://www.amnesiagame.com/#main).
diff --git a/english/dungeons-and-dragons/dungeons-and-dragons.md b/english/dungeons-and-dragons/dungeons-and-dragons.md
@@ -0,0 +1,3 @@
+You roll... 3...15...12...11...8...19!  Ooh, so close, almost a critical.
+Nevertheless it's good enough to hit the Cacode..err...Beholder.
+You deal 2d6+3 damage!
diff --git a/english/hawkstrider/error/error.md b/english/hawkstrider/error/error.md
@@ -0,0 +1,6 @@
+"Oh, traveler!  You seem to be unfamiliar with these birds.  They are quite friendly to strangers if you
+Know how to speak Thalassian.  Some bird whisperer also gave me a long lecture of speaking "hawkstrider".
+She said "Hawkstriders always sing in harmony, each taking turns to fill in their two note melody.  If a
+Sound is missed, the next will fill in the missed note."  I hope this is of some use to you."
+
+[Return to the start.](../start.md)
diff --git a/english/hawkstrider/rude/rude.md b/english/hawkstrider/rude/rude.md
@@ -0,0 +1,6 @@
+The hawkstrider leaps back, evidently startled.  It glares angrily at you for a moment,
+then quickly dashes off into the forest.
+
+That was extremely rude to say! Your adventure ends here.
+
+[Click here to return to english section](../../marshmallow.md)
diff --git a/english/hawkstrider/start.md b/english/hawkstrider/start.md
@@ -0,0 +1,11 @@
+You find a swift pink hawkstrider staring inquisitively at you.
+
+A. [Greetings, noble bird!](./error/error.md)
+
+B. [Tweet, tweet](./error/error.md)
+
+C. Anu belore dela'na
+
+D. [Rearrrrr](./startu/startu.md)
+
+E. [Urrrrrrr](./startr/startr.md)
diff --git a/english/hawkstrider/startr/startr.md b/english/hawkstrider/startr/startr.md
@@ -0,0 +1,11 @@
+The hawkstrider pauses for a moment then says:
+
+"Reaarrr. Urrrrr."
+
+A. [How ya doin fam?](../error/error.md)
+
+B. BREAK
+
+C. BREAK [Rude](../rude/rude.md)
+
+D. [Urrrrrrr](../error/error.md)
diff --git a/english/hawkstrider/startu/startu.md b/english/hawkstrider/startu/startu.md
@@ -0,0 +1,11 @@
+The hawkstrider pauses for a moment then says:
+
+"Urrrrrrrrr."
+
+A. [How ya doin fam?](../error/error.md)
+
+B. BREAK
+
+C. BREAK
+
+D. [Urrrrrrr](../error/error.md)
diff --git a/english/london/london.md b/english/london/london.md
@@ -4,3 +4,5 @@ I cloned it
 I created a branch
 I created a new folder and file within it (this one)
 I'm now going to try commit these changes and send a pull request - hopefully
+Hey! You got this! You are now ready to help people build open-source software!
+AWESOME!
diff --git a/english/marshmallow.md b/english/marshmallow.md
@@ -5,6 +5,8 @@ A few learned to [tango](tango/tango.md)
 Some preferred to
 Enter [The Forest!] (forest/forest.md)
 
+If you are a fan of ZooZoo go [here](zoozoo/zoozoo.md)
+
 hi~
 
 NGE is [here] (NGE/NGE.md)
@@ -36,6 +38,8 @@ You decide to drop everything you're doing and [run out the door](run_out_the_do
 
 Take some [time](meditation/meditation.md) off!
 
+[Roll a D20](dungeons-and-dragons/dungeons-and-dragons.md) and see what luck brings.
+
 Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md)
 
 Who is better?
diff --git a/english/zoozoo/zoozoo.md b/english/zoozoo/zoozoo.md
@@ -0,0 +1 @@
+This is the zoozoo fan page
diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md
@@ -23,3 +23,7 @@ Meine Kleidung hindert mich absolut am Schwimmen.
 Die Kälte des Wassers macht meine Bewegungen steif,
 die vollgesogene [Kleidung](Kleidung/Kleidung.md) macht sie träge.
 Irgendwie muss ich versuchen sie los zu werden!
+
+Die Situation scheint meinen Verstand vernebelt zu haben. 
+Die Kälte und das Wasser scheint ihr übriges zu tun. 
+Aber in einem lichten Moment erinnere ich mich an meine [Superkraefte](Superkraefte/Superkraefte.md).
diff --git a/german/Leichen/Superkraefte/Superkraefte.md b/german/Leichen/Superkraefte/Superkraefte.md
@@ -0,0 +1,7 @@
+Kaum ist der lichte Moment vorbei, setze ich meine Superkraft ein. 
+Ich kann mich in einen Feuerball verwandeln. Super! 
+Das mache ich auch sofort, muss aber auch direkt feststellen, dass ich ja im Wasser bin. 
+Also Feuerball sofort gelöscht...
+
+Da bin ich also, Superheld, mit vollkommen nutzloser Superkraft. Also bleibt nur weiter 
+[schwimmen](../../schwimmen/schwimmen.md).
diff --git a/language.md b/language.md
@@ -165,3 +165,5 @@ if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md)
 Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odyssey/HO.md)
 
 Astoli Dothraki ? [Dothrae jinne](dothraki/dothraki_evoli.md)
+
+Si Latine legere vis, [hic preme](latin/arena.md)
diff --git a/latin/arena.md b/latin/arena.md
@@ -0,0 +1,7 @@
+Eheu! In Collosseo stas. In manu gladium habes. Gladium re rubente
+limatum!!! Oh di immortales! Homines clamant atque furor Collosseum
+pervadit.
+Te adversum in arena sunt - non intueri volo - tres
+armiferae Amazones te ferociter intuentes!
+
+[Solum quod in tibi mentem venit est Ovidii carmen!](carmen/carmen.md)
diff --git a/latin/carmen/carmen.md b/latin/carmen/carmen.md
@@ -0,0 +1,5 @@
+Tremens tibi persuades esse in luco Arcadio et recitas:
+	stant calices; minor inde fabas, holus alter habebat,
+	et spumat testo pressus uterque suo.
+Inopinatissime unusquisque in Colloseo in imo pectore permotus est et
+tuus tremor decrescit.
diff --git a/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md
@@ -1,2 +1,4 @@
 O desenvolvedor te envia um e-mail dizendo que seria muito importante se você conseguisse reproduzir o bug novamente.
 E ele até mesmo te oferece uma recompensa para te motivar.
+
+[Você resolve tentar achar o bug pela recompensa.](tentativa/tentativa.md)
diff --git a/portugues/revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md b/portugues/revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md
@@ -0,0 +1,3 @@
+Depois de 3 dias trabalhando para achar o bug, você finalmente consegue.
+
+Você:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+You roll... 3...15...12...11...8...19! Ooh, so close, almost a critical.`
	`2`	`+Nevertheless it's good enough to hit the Cacode..err...Beholder.`
	`3`	`+You deal 2d6+3 damage!`