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

1 files changed, 86 insertions, 0 deletions

diff --git a/docs/index.html b/docs/index.html
new file mode 100644
index 000000000..1402f1242
--- /dev/null
+++ b/docs/index.html
@@ -0,0 +1,86 @@
+---
+layout: home
+title: Bootstrap
+---
+
+<main class="bs-masthead" id="content" role="main">
+  <div class="container">
+    <span class="bs-booticon bs-booticon-lg">B</span>
+    <h1>Bootstrap</h1>
+    <p class="lead">The most popular front-end framework for designing and building on the web.</p>
+    <p class="lead">
+      <a href="getting-started#download" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);">Download Bootstrap</a>
+    </p>
+    {% include ads.html %}
+  </div>
+</main>
+
+
+<div class="bs-featurette">
+  <div class="container">
+    <h2 class="bs-featurette-title">Designed for everyone, everywhere.</h2>
+    <p class="lead">Bootstrap is a responsive and mobile first framework for faster and easier web development. It's made for folks of all skill levels, devices of all shapes, and projects of all sizes.</p>
+
+    <hr class="half-rule">
+
+    <div class="row">
+      <div class="col-sm-4">
+        <img src="docs-assets/img/sass-less.png" alt="Sass and Less support" class="img-responsive">
+        <h3>Preprocesors</h3>
+        <p>In addition to vanilla CSS, Bootstrap includes support for the two most popular CSS preprocessors, <a href="{{ page.base_url }}css#using-less">Less</a> and <a href="{{ page.base_url }}css#using-sass">Sass</a>.</p>
+      </div>
+      <div class="col-sm-4">
+        <img src="docs-assets/img/devices.png" alt="Responsive across devices" class="img-responsive">
+        <h3>One framework, every device.</h3>
+        <p>Bootstrap easily and efficiently scales your project from phones to tablets to desktops with a single CSS file.</p>
+      </div>
+      <div class="col-sm-4">
+        <img src="docs-assets/img/components.png" alt="Components" class="img-responsive">
+        <h3>Comprehensive docs</h3>
+        <p>With Bootstrap, you get extensive and beautiful documentation with hundreds of live examples, code snippets, and more.</p>
+      </div>
+    </div>
+
+    <hr class="half-rule">
+
+    <p class="lead">Bootstrap is an open source project, hosted and maintained on GitHub.</p>
+    <a href="{{ site.repo }}" class="btn btn-outline btn-lg">View the GitHub project</a>
+  </div>
+</div>
+
+<div class="bs-featurette">
+  <div class="container">
+    <h2 class="bs-featurette-title">Built with Bootstrap.</h2>
+    <p class="lead">Millions of amazing sites across the web are being built with Bootstrap. Get started on your own with our growing <a href="{{ site.url }}/getting-started/#examples">collection of examples</a> or by exploring some of our favorites from <a href="{{ site.expo }}">the Expo</a>.</p>
+
+    <hr class="half-rule">
+
+    <div class="row bs-featured-sites">
+      <div class="col-sm-3">
+        <a href="http://expo.getbootstrap.com/" class="bs-featurette-img">
+          <img src="http://expo.getbootstrap.com/screenshots/coinbase.jpg" alt="" class="img-responsive">
+        </a>
+      </div>
+      <div class="col-sm-3">
+        <a href="http://expo.getbootstrap.com/" class="bs-featurette-img">
+          <img src="http://expo.getbootstrap.com/screenshots/localcrime.jpg" alt="" class="img-responsive">
+        </a>
+      </div>
+      <div class="col-sm-3">
+        <a href="http://expo.getbootstrap.com/" class="bs-featurette-img">
+          <img src="http://expo.getbootstrap.com/screenshots/fortrabbit.jpg" alt="" class="img-responsive">
+        </a>
+      </div>
+      <div class="col-sm-3">
+        <a href="http://expo.getbootstrap.com/" class="bs-featurette-img">
+          <img src="http://expo.getbootstrap.com/screenshots/sentry.jpg" alt="" class="img-responsive">
+        </a>
+      </div>
+    </div>
+
+    <hr class="half-rule">
+
+    <p class="lead">Head to the Bootstrap Expo for dozens of inspiring projects built on Bootstrap.</p>
+    <a href="{{ site.expo }}" class="btn btn-outline btn-lg">Explore the showcase</a>
+  </div>
+</div>