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

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

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

Merge pull request #113 from chschmitz/master

New German layout for ErgoDox, similar to Kinesis Ergo Elan and regular German keyboards

Added .hex file.

Fixed graphics.

Added media layer.

Added links.

Added documentation.

Made all layer change keys momentary. Removed Hyper and Meh in favor of layer 1 and 2 on both halves.

added new macros

playing more with cursor keys

playing a bit with cursor keys

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

Switched up and down keys to be closer to the vi etc. world.

Fixed circonflex key.

Fixed regarding Ctrl and Alt keys.

Added a German layout inspired by the Kinesis Ergo Elan and based on the "german" keymap.

Merge pull request #110 from mollat/master

add mollat keymap

add mollat keymap