Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 40 insertions, 0 deletions

diff --git a/keyboards/40percentclub/ut47/readme.md b/keyboards/40percentclub/ut47/readme.md
new file mode 100644
index 000000000..bbae1384a
--- /dev/null
+++ b/keyboards/40percentclub/ut47/readme.md
@@ -0,0 +1,40 @@
+# ut47
+
+![ut47](https://i.imgur.com/ZDKZQaj.jpg)
+===
+
+Somewhere between ortholinear and standard offset. Created to have all the same functions on a Planck in a keyboard but with a more conventional keyboard row stagger.
+
+Keyboard Maintainer: [filoxo](https://github.com/filoxo), [network_operations]  
+Hardware Supported: [PCB design](http://www.40percent.club/2016/10/gnap-20-plateless.html), Arduino Pro Micro  
+Hardware Availability: [How to order](http://www.40percent.club/2017/03/ordering-pcb.html)
+
+### Instructions
+
+To flash the UT47 without LEDs (single controller), run:
+
+    make 40percentclub/ut47:default
+
+To enable the UT47 LEDs (dual controller), run this for the main controller:
+
+    make 40percentclub/ut47:default LED_ENABLE=yes
+
+Or you can add `LED_ENABLE = yes` to *rules.mk*
+
+And then flash [LED_controls.ino](LED_controls.ino) to the second controller using [Arduino IDE](https://www.arduino.cc/en/Main/Software) or similar. NOTE: Arduino IDE will require importing additional libraries to compile.
+
+<small>The reason this is an "opt-in" feature is to prevent sending serial communication over the pin, in case it ends up being used for something else (like RGB underglow).</small>
+
+### Layout
+
+Go to the [default layout README](keymaps/default/readme.md) for more information.
+
+### Additional info
+
+Credit: Forked from [di0ib TMK version](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/gnap)
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+
+### Build Guide
+
+[u/network_operations' build guide thread](https://www.reddit.com/r/MechanicalKeyboards/comments/7wqktu/gnap_the_cheap_40/)