Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html

1 files changed, 40 insertions, 16 deletions

diff --git a/docs/components.html b/docs/components.html
index ea58cecb8..ee14526e5 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -58,24 +59,19 @@
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
                 <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
             </li>
-            <li class="dropdown active">
-              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
-                Components
-                <b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="./components.html#buttonGroups">Button groups</a></li>
-                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
-                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
-                <li><a href="./components.html#navbar">Navbar</a></li>
-                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
-                <li><a href="./components.html#pagination">Pagination</a></li>
-                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
-                <li><a href="./components.html#alerts">Alert messages</a></li>
-                <li><a href="./components.html#progress">Progress bars</a></li>
-              </ul>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
+            </li>
+            <li class="active">
+              <a href="./components.html">Components</a>
             </li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
                 Javascript plugins
@@ -100,6 +96,13 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,12 +111,33 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Components</h1>
+        <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
+        <ul class="nav pills">
+          <li><a href="./components.html#buttonGroups">Button groups</a></li>
+          <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+          <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+          <li><a href="./components.html#navbar">Navbar</a></li>
+          <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+          <li><a href="./components.html#pagination">Pagination</a></li>
+          <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+          <li><a href="./components.html#alerts">Alerts</a></li>
+          <li><a href="./components.html#progress">Progress bars</a></li>
+        </ul>
+      </header>
+
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
   <!-- Button Groups