merge

index.html

@@ -10,8 +10,12 @@
 <title>Bootstrap Layout</title>
 
 <!-- Le styles -->
+<<<<<<< HEAD
 <!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> -->
 <link rel="stylesheet" href="https://d23nuec95rapgw.cloudfront.net/apps/front_end/assets/ui_toolbox/main-67121e1c236c4e6e808a64009b92cc7851813910fee5e66185ebbf45d7ee9756.css">
+=======
+<link href="css/toolbox.css" rel="stylesheet">
+>>>>>>> 09a95fb991d265e9eb8ac7eac63c4c6813e244a8
 <link href="css/layoutit.css" rel="stylesheet">
 <link href="css/docs.min.css" rel="stylesheet">
 <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
@@ -80,6 +84,7 @@
 <div class="changeDimension">
   <div class="row-fluid">
     <div class="">
+			<span></span>
       <div class="sidebar-nav">
         <ul class="nav nav-list accordion-group">
           <li class="nav-header">