Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 15 insertions, 0 deletions

diff --git a/keyboards/sol/readme.md b/keyboards/sol/readme.md
new file mode 100644
index 0000000000..65e89ff635
--- /dev/null
+++ b/keyboards/sol/readme.md
@@ -0,0 +1,15 @@
+# Sol
+
+![Sol](https://cdn.shopify.com/s/files/1/0008/8827/5005/products/CqdJAno_2048x2048.jpg?v=1533825028)
+
+Sol is a split ergonomic keyboard with ortholinear alphas and several modifier layouts. It can use up to 88 RGB LEDs, with per-key backlighting and underglow. The boards have presoldered components, including type C ports and ATmega32U4. Sol, when used with dual power supplies, is the brightest keyboard on earth.
+
+Keyboard Maintainer: [Legonut](https://github.com/Legonut)  
+Hardware Supported: Sol PCB R1.0, R1.1  
+Hardware Availability: [RGBKB](https://www.rgbkb.net)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sol:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).