Merge remote-tracking branch 'upstream/master'

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

resolves conflicts in rgblight.c

# Conflicts:
#	quantum/rgblight.c

Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent

Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide

Adding clueboard/cluepad support to qmk

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

Merge pull request #165 from deepshitgoeshere/deepshitgoeshere-master

added planck keymap and troubleshooting part in the PCB guide

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

ignore dfu-programme.exe in commits

Merge branch 'jackhumbert-master'

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

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

Merge pull request #158 from DidierLoiseau/eclipse-config

Add Eclipse settings files to .gitignore

Added eclipse settings files to .gitignore

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

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

Merge pull request #130 from jacobono/jacobono

Jacobono

my personal ergodox keymap layout

with pngs of layout and readme

Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile