Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Merge pull request #669 from fredizzimo/windows10_build_instructions
Add instructions for Windows 10 subsystem for Linux
Merge pull request #668 from fredizzimo/line_endings
Enforce correct line endings
Merge pull request #674 from kyleberry/master
Fixing Dvorak
Fixing Dvorak
Updating with proper Dvorak layout.
Add warning about line endings
Add instructions for Windows 10 subsystem for Linux
Also simplify the linux instructions
Merge pull request #665 from linsomniac/keymap_jafo
Adding jafo layout.
Merge pull request #658 from Xyverz/master
Got rid of all the kludge in my ErgoDox keymap.
Merge pull request #630 from nrrkeene/master
The Ordinary Layout is the unsurprising layout
Add .gitattributes to ensure correct line endings
It also ensures that make files and shell script are checked out
with lf endings, for compability with the Windows 10 bash
fixed color detection routine in makefile
fixed color detection routine in makefile
Merge remote-tracking branch 'upstream/master'
Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.