Merge branch 'master' into patch-4

cnames_active.js

@@ -95,6 +95,7 @@ var cnames_active = {
   "ahmad": "aruzikulov.github.io/ahmad",
   "ahmeterdgn": "ahmeterdgn.github.io",
   "ahooks": "ahooks.surge.sh",
+  "aider": "tjz101.github.io/aider-js-pages",
   "airtable-plus": "victorhahn.github.io/airtable-plus",
   "ais": "yunyoujun.github.io/ais.js",
   "ajaxable": "artf.github.io/ajaxable",
@@ -717,6 +718,7 @@ var cnames_active = {
   "flvplayer": "zhw2590582.github.io/FlvPlayer",
   "flybook": "rhiokim.github.io/flybook",
   "flying-squid.prismarine": "prismarinejs.github.io/flying-squid",
+  "flysoft": "minecraftsky.github.io",
   "fnx": "fnxjs.gitbooks.io/fnx-documentation",
   "focusoverlay": "mmahandev.github.io/FocusOverlay",
   "fontdragr": "ryanseddon.github.io/font-dragr",
@@ -1133,7 +1135,6 @@ var cnames_active = {
   "lribeiro": "lmribeiro.github.io",
   "ls": "links-js.github.io",
   "lucy": "lucy-bot.github.io",
-  "luisfelipe": "luisfelip3.github.io",
   "luisoka": "luisoka.github.io",
   "lukks": "lukks.github.io/page",
   "lvp": "luzhenqian.github.io/lvp.js",