Merge branch 'master2' into replaceStructureWord

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

json/poet.tang.20000.json

@@ -6691,6 +6691,34 @@
     ], 
     "title": "臥疾"
   }, 
+  {
+    "author": "張籍", 
+    "paragraphs": [
+      "身病始知道，卧讀神農經。", 
+      "空房夜留燈，四壁青熒熒。", 
+      "羇旅逐人歡，貧賤還自輕。", 
+      "今來問良醫，乃知病所生。", 
+      "僮僕各相憂，杵臼無停聲。", 
+      "見我形憔悴，勸藥語丁寧。", 
+      "春雨枕席冷，窗前新禽鳴。", 
+      "開門起無力，遥愛鷄犬行。", 
+      "服藥察耳目，漸覺如酒醒。", 
+      "方悟養生者，不為憂患并。"
+    ], 
+    "strains": [
+      "平仄仄平仄，仄仄平平平。", 
+      "平平仄平平，仄仄平平平。", 
+      "？仄仄平平，平仄平仄平。", 
+      "平平仄平平，仄平仄仄平。", 
+      "平？仄平？，仄仄平平平。", 
+      "仄仄平平仄，仄仄仄平？。", 
+      "平仄仄仄仄，平平平平平。", 
+      "平平仄平仄，平仄？仄平。", 
+      "仄仄仄仄仄，仄仄平仄仄。", 
+      "平仄仄平仄，平？？仄仄。"
+    ], 
+    "title": "臥疾"
+  }, 
   {
     "author": "張籍", 
     "paragraphs": [
@@ -13641,6 +13669,18 @@
     ], 
     "title": "村醉"
   }, 
+  {
+    "author": "盧仝", 
+    "paragraphs": [
+      "村醉黄昏歸，健倒三四五。", 
+      "摩娑莓苔背，嗔我驚爾不。"
+    ], 
+    "strains": [
+      "平仄平平平，仄仄仄仄仄。", 
+      "平平平平仄，平仄平仄仄。"
+    ], 
+    "title": "村醉"
+  }, 
   {
     "author": "盧仝", 
     "paragraphs": [