Merge branch 'master' into tcg_random

data/default_config.json

@@ -65,12 +65,8 @@
       "get_zh": false
     },
     "dialogues": {
-<<<<<<< HEAD
-      "enabled": false,
-      "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
-=======
       "enabled": true,
->>>>>>> mc
+      "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
       "get": "http://mercury233.me/ygosrv233/dialogues.json"
     },
     "words": {