merge in new ads
fixes #10961: change variable names in grid docs
Merge branch 'master' of github.com:twbs/bootstrap
update gitignore to restore the ruby-version ignore and rename section to all docs stuff
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	css.html
run grunt
Fixes #10959: round the .lead values down to nearest pixel via floor()
Merge branch 'master' of github.com:twbs/bootstrap
Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere
Fixes #10126: Update responsive test cases to properly highlight hidden class examples
fix #10986
Updare grunt-jekyll dependency
Merge pull request #10996 from ZDroid/patch-6

Updare grunt-jekyll dependency
Merge branch '3.0.0'

Conflicts:
	dist/css/bootstrap.min.css
	scss/_modals.scss
	scss/_type.scss