Merge remote-tracking branch 'origin/master' into develop

keyboards/yampad/info.json

@@ -0,0 +1,35 @@
+{
+    "keyboard_name": "Yampad",
+    "url": "",
+    "maintainer": "mattdibi",
+    "height": 5,
+    "width": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+
+                {"label":"k10", "x":0, "y":1},
+                {"label":"k11", "x":1, "y":1},
+                {"label":"k12", "x":2, "y":1},
+
+                {"label":"k20", "x":0, "y":2},
+                {"label":"k21", "x":1, "y":2},
+                {"label":"k22", "x":2, "y":2},
+                {"label":"k13", "x":3, "y":1, "h":2},
+
+                {"label":"k30", "x":0, "y":3},
+                {"label":"k31", "x":1, "y":3},
+                {"label":"k32", "x":2, "y":3},
+
+                {"label":"k40", "x":0, "y":4},
+                {"label":"k41", "x":1, "y":4},
+                {"label":"k42", "x":2, "y":4},
+                {"label":"k43", "x":3, "y":3, "h":2}
+            ]
+        }
+    }
+}