resolve merge conflict

diff --cc bootstrap-1.0.0.css
Simple merge

diff --cc bootstrap-1.0.0.min.css
Simple merge

diff --cc docs/assets/js/application.js
index 4b377f704372542dd610c5d901e3880a66b5271c,8b29f6c21a113452ede7c5e029462b354736d65c..82cf307e91bc45faa2eb342479248e8282ee13bd
--- 1/docs/assets/js/application.js
--- 2/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@@ -34,9 -81,12 +81,12 @@@ $(document).ready(function()
        $(this).parents('.add-on').removeClass('active');
      }
    });
-   
-   // Disable certain links and buttons in docs
+ 
+ 
+   // Disable certain links in docs
+   // =============================
+ 
 -  $('ul.tabs a, ul.pills a, .pagination a').click(function(e) {
 +  $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function(e) {
      e.preventDefault();
    });