changes to the template

not sure how this got here..

Merge pull request #104 from jackhumbert/smarkefile

Rework Planck file structure

rename file

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

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

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

starting the hand-wiring guide

Merge pull request #102 from sboesebeck/master

osx_de/keymap.c file is missing... 

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

Merge pull request #97 from DidierLoiseau/typematrix

TypeMatrix 2030 Layout for ErgoDox EZ

Fixed rendering of the Layer Switching section

Fixed small issues in README.md

- fixed rendering of the basic layer on GitHub
- fixed missing Calculator, Mail & Browser Home keys in Fn Layer

Added keymap.hex

Moved layout description to README.md and added more details

Added Calculator, Mail and Browser Home application keys.

Renamed "Numbers Layer" to "Numeric Layer"

Implemented new folders structure.

moved keymap_typematrix.c to tm2030/keymap.c

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

Merge pull request #100 from RageZBla/colemak

Add colemak keymap to Ergodox EZ.