Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck'

Adding Musical Notes

MAGIC functionality, AG swap in default layout

Merge pull request #256 from jackhumbert/new_defaults

New default planck layout, audio fixes, makefile overwrites, tri-layer quantum-wide

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.

[Erez & Jack] Makes tri-layer available across Quantum

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

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

Merge remote-tracking branch 'jackhumbert/master' into typematrix

Merge pull request #93 from petereichinger/master

LCAG modifier combo and AutoHotkey international characters

Add defines for CtrlAltGui modifiers

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

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c

Merge pull request #45 from matzebond/master

German keymap + ErgoDox keymaps

Add Ctrl-Shift tap modifier

atomic hex

[Jack & Erez] Adds standalone versions of Hyper and Meh

[Erez & Jack] Adds Meh key (Hyper without Win/Cmd)

Adds Hyper key, tweaks ErgoDox EZ default keymap

changes