Merge pull request #42 from schoolofma/master

adding School of MA to code of conduct

Author: skade

data/supporters.json

@@ -322,3 +322,19 @@
   "conferences": [
   ]
 }
+
+ {
+      "name": "School of Machines, Making & Make-Believe",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://schoolofma.org/",
+      "twitter": "SchoolOfMaaa",
+      "contacts": [
+        {
+          "name": "Rachel Uwa",
+          "phone": "+49 151 7537 4602",
+          "email": "[email protected]",
+          "twitter": "onna_no_hito"
+        },
+      ]
+    },