Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

keyboard/planck/keymaps/experimental/config.h

@@ -0,0 +1,8 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#define LEADER_TIMEOUT 300
+
+#endif

keyboard/planck/keymaps/experimental/keymap.c

@@ -321,8 +321,6 @@ void music_scale_user(void)
 
 LEADER_EXTERNS();
 
-#define LEADER_TIMEOUT 300
-
 void matrix_scan_user(void) {
   LEADER_DICTIONARY() { 
     leading = false;

keyboard/planck/keymaps/lucas/keymap.c

@@ -12,6 +12,7 @@ If you have any question about this keymap feel free to shoot me a message on re
 #include "keymap_extras/keymap_german.h"
 #include "backlight.h"
 #include "debug.h"
+#include "action_layer.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Colemak   
@@ -111,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   {KC_NO,   KC_NO,   KC_TAB, KC_LALT, KC_NO, KC_SPC, KC_SPC, LCTL(KC_SPC), KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT}
 },
 [6] = { /* Gaming 
-        /* CS:GO buy binds
+         * CS:GO buy binds
     * ,-----------------------------------------------------------------------.
     * |     |     |     |     |     |     |     |     |  7  |  8  |  9  |     |
     * |-----------------------------------------------------------------------|

keyboard/planck/planck.h

@@ -2,6 +2,7 @@
 #define PLANCK_H
 
 #include "quantum.h"
+#include <avr/interrupt.h>
 
 #define PLANCK_MIT( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \