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

keyboards/program_yoink/info.json

@@ -190,13 +190,13 @@
 				{"x":8, "y":2}, 
 				{"x":9, "y":2}, 
 				{"x":10, "y":2}, 
-				{"x":12.5, "y":2}, 
+				{"x":12.75, "y":2}, 
 				{"x":11.25, "y":2.25}, 
 				{"x":0, "y":3}, 
 				{"x":1, "y":3}, 
 				{"x":2, "y":3}, 
 				{"x":3, "y":3, "w":2.75},
-				{"x":2, "y":3, "w":7}, 
+				{"x":5.75, "y":3, "w":2.25}, 
 				{"x":8, "y":3}, 
 				{"x":9, "y":3}, 
 				{"x":10.25, "y":3.25},