Merge remote-tracking branch 'upstream/master' into node-requirable

Conflicts:
	Gruntfile.js

1 files changed, 4 insertions, 4 deletions

diff --git a/docs/index.html b/docs/index.html
index e5ea7d6a5..bab3c0f88 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,6 +1,6 @@
 ---
 layout: home
-title: Bootstrap
+title: Bootstrap · The world's most popular mobile-first and responsive front-end framework.
 ---
 
 <main class="bs-docs-masthead" id="content" role="main">
@@ -26,7 +26,7 @@ title: Bootstrap
       <div class="col-sm-4">
         <img src="assets/img/sass-less.png" alt="Sass and Less support" class="img-responsive">
         <h3>Preprocessors</h3>
-        <p>Bootstrap ships with vanilla CSS, but it's source code utilizes the two most popular CSS preprocessors, <a href="../css/#less">Less</a> and <a href="../css/#sass">Sass</a>. Quickly get started with precompiled CSS or build on the source.</p>
+        <p>Bootstrap ships with vanilla CSS, but its source code utilizes the two most popular CSS preprocessors, <a href="../css/#less">Less</a> and <a href="../css/#sass">Sass</a>. Quickly get started with precompiled CSS or build on the source.</p>
       </div>
       <div class="col-sm-4">
         <img src="assets/img/devices.png" alt="Responsive across devices" class="img-responsive">
@@ -56,9 +56,9 @@ title: Bootstrap
 
     <div class="row bs-docs-featured-sites">
     {% for showcase in site.data.showcase %}
-      <div class="col-sm-3">
+      <div class="col-xs-6 col-sm-3">
         <a href="{{ showcase.expo_url }}" target="_blank" title="{{ showcase.name }}">
-          <img src="{{ showcase.img }}" alt="{{ showcase.name }}" class="img-responsive">
+          <img src="http://expo.getbootstrap.com/thumbs/{{ showcase.img }}-thumb.jpg" alt="{{ showcase.name }}" class="img-responsive">
         </a>
       </div>
     {% endfor %}