Merge branch 'master2' into replaceStructureWord

# Conflicts:
#	json/poet.tang.43000.json

json/poet.tang.8000.json

@@ -4166,6 +4166,20 @@
     ], 
     "title": "白雲歌送劉十六歸山"
   }, 
+  {
+    "author": "李白", 
+    "paragraphs": [
+      "楚山秦山多白雲，白雲䖏䖏長隨君。", 
+      "君今還入楚山裏，雲亦隨君渡湘水。", 
+      "水上女蘿衣白雲，早卧早行君早起。"
+    ], 
+    "strains": [
+      "仄平平平平仄平，仄平？？平平平。", 
+      "平平平仄仄平仄，平仄平平仄平仄。", 
+      "仄仄仄平平仄平，仄仄仄平平仄仄。"
+    ], 
+    "title": "白雲歌送友人"
+  }, 
   {
     "author": "李白", 
     "paragraphs": [