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

Conflicts:
	bootstrap.css
	lib/responsive.less

diff --cc bootstrap.css
index 256ab096bbdd65c53efa529cb9c5a411de0d434c,7eef72feef7c84d0def22728d3d5e635521adfbc..aebabeecca145949743609021cee5953b8e37fa9
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,11 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD
 + * Date: Sat Oct 22 15:49:12 PDT 2011
++=======
+  * Date: Fri Oct 21 11:54:44 CDT 2011
++>>>>>>> 2e09ffe3832106fab60dc01cc3159c13029bdf68
   */
  /* 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).