Merge pull request #254 from IBNobody/master

Atomic TLC / Compiler Warning Fixes

Compiler Warnings / Atomic TLC

Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.

Merge pull request #5 from jackhumbert/master

Sync with upstream

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

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

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

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

Merge pull request #219 from IBNobody/master

Master

Minor Tweaks and Documentation

Fixed compiler warning by including bootloader.h in keymap_common.c.

Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.

Added extra documentation to the template config.h

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

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

Merge pull request #145 from gerbercj/feature/atreus_astar

Add support for Atreus running on A-Star

Add support for Atreus running on A-Star

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

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

Merge pull request #131 from Vifon/patch-1

Use boolean AND instead of bitwise (possible typo)

Use boolean AND instead of bitwise (possible typo)

Fortunately seems harmless.

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

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

Merge remote-tracking branch 'upstream/master'