Merge branch 'customizable-grid-gutters-per-breakpoint' of https://github.com/pixelba...

diff --cc docs/layout/grid.md
index ec80156a4193c35d865cb3cfd9a13543784d3009,d64322dea437902bb392a6ddd476a9e0bedca081..47e8f4470b34daff1bc4efc77ef8d9c0e304472d
--- 1/docs/layout/grid.md
--- 2/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@@ -1,7 -1,6 +1,7 @@@
- ---
+ atom---
  layout: docs
  title: Grid system
 +description: Documentation and examples for using Bootstrap's powerful, responsive, and mobile-first grid system.
  group: layout
  ---
  

diff --cc scss/_variables.scss
Simple merge