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

keyboards/leafcutterlabs/bigknob/keymaps/default/keymap.c

@@ -28,8 +28,8 @@ void encoder_update_user(uint8_t index, bool clockwise) {
   } 
 }
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest to usb is first
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //button closest to USB is first
   [_MAIN] = LAYOUT(
      KC_MUTE, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_STOP, KC_MNXT
   )
-};
+};