Merge branch 'master' into docs_derp

Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html

examples/grid/index.html → docs/examples/grid/index.html

@@ -112,9 +112,13 @@
       <hr>
 
       <h3>Column clearing</h3>
-      <p>Clear floats at specific breakpoints to prevent awkward wrapping with uneven content.</p>
+      <p><a href="http://getbootstrap.com/css/#grid-responsive-resets">Clear floats</a> at specific breakpoints to prevent awkward wrapping with uneven content.</p>
       <div class="row">
-        <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
+        <div class="col-xs-6 col-sm-3">
+          .col-xs-6 .col-sm-3
+          <br>
+          Resize your viewport or check it out on your phone for an example.
+        </div>
         <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
 
         <!-- Add the extra clearfix for only the required viewport -->