Merge pull request #15 from skade/master

Add @MrgnBerlin

Author: PragTob

data/supporters.json

@@ -99,6 +99,25 @@
           "email": "[email protected]"
         }
       ]
+    },
+    {
+      "name": "mrgn",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://mrgn.in/berlin/",
+      "twitter": "MrgnBerlin",
+      "contacts": [
+        {
+          "name": "Florian Gilcher",
+          "phone": "+49 172 8122469",
+          "email": "[email protected]"
+        },
+        {
+          "name": "Cristina Santamarina",
+          "phone": "+49 151 19446249",
+          "email": "[email protected]"
+        }
+      ]
     }
   ],
   "conferences": [