Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css

docs/examples/carousel/index.html

@@ -51,13 +51,8 @@
         <li data-target="#myCarousel" data-slide-to="2"></li>
       </ol>
       <div class="carousel-inner" role="listbox">
-<<<<<<< HEAD
         <div class="carousel-item active">
-          <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
-=======
-        <div class="item active">
           <img class="first-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
->>>>>>> master
           <div class="container">
             <div class="carousel-caption text-left">
               <h1>Example headline.</h1>
@@ -66,13 +61,8 @@
             </div>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="carousel-item">
-          <img src="data:image/gif;base64,R0lGODlhAQABAIAAAGZmZgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide">
-=======
-        <div class="item">
           <img class="second-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide">
->>>>>>> master
           <div class="container">
             <div class="carousel-caption">
               <h1>Another example headline.</h1>
@@ -81,13 +71,8 @@
             </div>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="carousel-item">
-          <img src="data:image/gif;base64,R0lGODlhAQABAIAAAFVVVQAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide">
-=======
-        <div class="item">
           <img class="third-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide">
->>>>>>> master
           <div class="container">
             <div class="carousel-caption text-right">
               <h1>One more for good measure.</h1>