Merge pull request #148 from cub-uanic/patch-1

Fix keycode.txt 

Merge pull request #151 from bswinnerton/typo-fix

Fixing typo in console mode

Merge branch 'vovcacik-ghost_squid'

Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid

Conflicts:
	README.md

Merge pull request #164 from cub-uanic/patch-2

Update other_projects.md - added TMK/Ergodox

Fix typo 'keyobard' #166

Merge branch 'xauser-forhasu'

Revert "Changed hotkey for bootloader jump"

This reverts commit f31cbc7219c9a1903331771c10056302817e68ca.

Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu

hhkb: Update RN-42 docs

Added missing keyboards to main README

Added NerD 80% (TKL) support

Added NerD 60% support

Changed hotkey for bootloader jump

Merge branch 'rn42_integrate'

hhkb: Integrate RN-42 support, remove hhkb_rn42

hhkb_rn42: Move doc

hhkb: Fix layer stuck of keymap_hasu

- In mouse key layer with holding semicolon, press Fn0, release
  semicolon and release Fn0 now layer 1 is stuck.

Merge branch 'rn42'

rn42: Update doc