resolve merge conflict

adieuadieu · adieuadieu · commit 96fcd0183dce · 2018-02-14T14:52:34.000+01:00
diff --git a/package.json b/package.json
@@ -15,6 +15,10 @@
       "name": "Lars F. Karlström",
       "email": "lars@lfk.io"
     },
+    {
+      "name": "Marco Lüthy",
+      "email": "marco.luethy@gmail.com"
+    },
     {
       "name": "Rui Marinho",
       "email": "ruipmarinho@gmail.com"
