conflict

diff --cc bootstrap-1.3.0.css
index dbe1bdcfa32f8f0435100f8ca4d1894dae2027f4,f42e314a2ec7dd5f5ab4f6ccdfc9fa006022589e..9eef0b12aa6fa4bc40fd0a297aac1cfe7f122331
--- 1/bootstrap-1.3.0.css
--- 2/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Sat Sep 10 12:59:54 PDT 2011
 - * Date: Fri Sep  9 22:48:53 PDT 2011
++ * Date: Sat Sep 10 13:04:12 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

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

diff --cc docs/index.html
Simple merge