Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Merge pull request #188 from DidierLoiseau/issue-156
Fix #156: clear weak mods on every key press
Merge pull request #211 from nrrkeene/master
The Ordinary Layout is unremarkably mundane and remarkably useful
Merge pull request #196 from naps62/naps62
Adds naps62's Ergodox EZ layout
The Ordinary Layout is unremarkably mundane and remarkably useful
Merge pull request #207 from romanzolotarev/master
Add important note about brightness on OS X
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
The Ordinary Layout is familiar to users of common keyboards
Merge pull request #210 from n0bs/master
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
Edited to work with jackhumbert/qmk_firmware pull #190
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
Merge pull request #209 from n0bs/master
Added project folder for Bantam-44
Merge pull request #200 from alexives/add_diagram_to_planck_layout
Added layout diagrams to the default planck keymap
Added files for Bantam-44
Merge pull request #199 from IBNobody/master
Added LED Indicator Support to QMK Template
Fixed extra semicolons.
Fixed extra semicolons.
Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
Add important note about brightness on OS X