Merge remote-tracking branch 'tmk/master'

Conflicts:
	README.md

diff --combined README.md
index f4d1eed238fe32018af452fda0bb660122455a7a,dd03e1403def0e66cc0139bf5e2ab56f37441dac..78610f4b803e5500557e83d90fae870aeaf588c1
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -53,8 -53,17 +53,16 @@@ You can find some keyboard specific pro
  * [macway](keyboard/macway/)                - [Compact keyboard mod][GH_macway] [retired]
  * [KMAC](keyboard/kmac/)                    - Korean custom keyboard
  * [Lightsaber](keyboard/lightsaber/)        - Korean custom keyboard
- * [ErgoDox](keyboard/ergodox/)              - [ergonomic keyboard with split design][GH_ergodox] (see [Ergodox-FAQ.md](keyboard/ergodox/Ergodox-FAQ.md))
+ * [Infinity](keyboard/infinity/)            - Massdrop [Infinity keyboard][Infinity]
+ * [NerD](keyboard/nerd/)                    - Korean custom keyboard
+ * [KittenPaw](keyboard/kitten_paw)          - Custom Majestouch controller
+ * [Lightpad](keyboard/lightpad)             - Korean custom keypad
+ * [ghost_squid](keyboard/ghost_squid/)      - [The Ghost Squid][ghost_squid] controller for [Cooler Master QuickFire XT][cmxt]
++* [ErgoDox](keyboard/ergodox/)              - [Ergonomic keyboard][ergodox_org] [with split design][GH_ergodox] (see [Ergodox-FAQ.md](keyboard/ergodox/Ergodox-FAQ.md))
+ 
+ ### Extenal projects using tmk_keyboard
 -* [ErgoDox_cub-uanic][cub-uanic]            - Split Ergonomic Keyboard [ErgoDox][ergodox_org]
+ * [mcdox][mcdox_tmk]                        - [mcdox][mcdox]
  
 -
  [GH_macway]:    http://geekhack.org/showwiki.php?title=Island:11930
  [GH_hhkb]:      http://geekhack.org/showwiki.php?title=Island:12047
  [GH_ps2]:       http://geekhack.org/showwiki.php?title=Island:14618
@@@ -66,7 -75,6 +74,7 @@@
  [GH_x68k]:      http://geekhack.org/showwiki.php?title=Island:29060
  [GH_hbkb]:      http://geekhack.org/showwiki.php?title=Island:29483
  [GH_ibm4704]:   http://geekhack.org/index.php?topic=54706.0
 +[GH_ergodox]:   http://geekhack.org/index.php?topic=48106.0
  [HID_liber]:    http://deskthority.net/wiki/HID_Liberation_Device_-_DIY_Instructions
  [Phantom]:      http://geekhack.org/index.php?topic=26742
  [GH60]:         http://geekhack.org/index.php?topic=34959
@@@ -74,6 -82,13 +82,13 @@@
  [PC98]:         http://en.wikipedia.org/wiki/NEC_PC-9801
  [Sun]:          http://en.wikipedia.org/wiki/Sun-3
  [IIGS]:         http://en.wikipedia.org/wiki/Apple_IIGS
+ [Infinity]:     https://www.massdrop.com/buy/infinity-keyboard-kit
+ [ghost_squid]:  http://deskthority.net/wiki/Costar_replacement_controllers#The_Ghost_Squid
+ [cmxt]:         http://gaming.coolermaster.com/en/products/keyboards/quickfirext/
+ [ergodox_org]:  http://ergodox.org/
+ [cub-uanic]:    https://github.com/cub-uanic/tmk_keyboard/tree/master/keyboard/ergodox
+ [mcdox]:        https://github.com/DavidMcEwan/mcdox
+ [mcdox_tmk]:    https://github.com/DavidMcEwan/tmk_keyboard/tree/master/keyboard/mcdox
  
  
  
@@@ -278,4 -293,4 +293,4 @@@ Coding Styl
  
  Other Keyboard Firmware Projects
  ------------------
- See [doc/other_projects.md](doc/other_projects.md).
+ You can learn a lot about keyboard firmware from these. See [doc/other_projects.md](doc/other_projects.md).