Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css

diff --cc _config.yml
index 6f68eb7521773bc3e89ad7fd9c489554132d9310,d3c51969e712128d16e00266c860489a42dac352..332f252fd79c13016192b567ed8ff122583857ca
--- 1/_config.yml
--- 2/_config.yml
+++ b/_config.yml
@@@ -12,12 -12,9 +12,9 @@@ port:             900
  
  # Custom vars
  repo:             https://github.com/twbs/bootstrap
 -download:         https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip
 -download_dist:    http://getbootstrap.com/bs-v3.0.0-rc.2-dist.zip
 +download:         https://github.com/twbs/bootstrap/archive/v3.0.0.zip
 +download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
  
- glyphicons:       http://glyphicons.getbootstrap.com
- glyphicons_repo:  https://github.com/twbs/bootstrap-glyphicons
- 
  blog:             http://blog.getbootstrap.com
  expo:             http://expo.getbootstrap.com
  

diff --cc _layouts/home.html
Simple merge

diff --cc css.html
Simple merge

diff --cc customize.html
Simple merge

diff --cc examples/justified-nav/justified-nav.css
index 9b8929c35dedc4276bb8a74180872723c32895e1,20134203c87bfe6ce983ba0f5b63bdf677cc4178..7837acf40bac547c521a2db2100d8a7962b69540
--- 1/examples/justified-nav/justified-nav.css
--- 2/examples/justified-nav/justified-nav.css
+++ b/examples/justified-nav/justified-nav.css
@@@ -83,8 -76,8 +76,6 @@@ body 
    }
  }
  
--
--
  /* Responsive: Portrait tablets and up */
  @media screen and (min-width: 768px) {
    /* Remove the padding we set earlier */

diff --cc getting-started.html
Simple merge