增加自己的注释
Merge remote-tracking branch 'origin/master'

Conflicts:
	.editorconfig
	.gitattributes
	.gitignore
	.travis.yml
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	_config.yml
	bower.json
	composer.json
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_data/showcase.yml
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/header.html
	docs/_includes/social-buttons.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/img/components.png
	docs/assets/img/devices.png
	docs/assets/img/sass-less.png
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/ie8-responsive-file-warning.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/holder.js
	docs/assets/js/vendor/less.min.js
	docs/assets/js/vendor/uglify.min.js
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/blog.css
	docs/examples/blog/index.html
	docs/examples/carousel/carousel.css
	docs/examples/carousel/index.html
	docs/examples/cover/cover.css
	docs/examples/cover/index.html
	docs/examples/dashboard/dashboard.css
	docs/examples/dashboard/index.html
	docs/examples/grid/grid.css
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron-narrow/jumbotron-narrow.css
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/justified-nav/justified-nav.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar-static-top/navbar-static-top.css
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/offcanvas/index.html
	docs/examples/offcanvas/offcanvas.css
	docs/examples/offcanvas/offcanvas.js
	docs/examples/screenshots/carousel.jpg
	docs/examples/screenshots/grid.jpg
	docs/examples/screenshots/jumbotron-narrow.jpg
	docs/examples/screenshots/justified-nav.jpg
	docs/examples/screenshots/navbar-fixed.jpg
	docs/examples/screenshots/navbar-static.jpg
	docs/examples/screenshots/navbar.jpg
	docs/examples/screenshots/non-responsive.jpg
	docs/examples/screenshots/starter-template.jpg
	docs/examples/screenshots/sticky-footer-navbar.jpg
	docs/examples/signin/index.html
	docs/examples/signin/signin.css
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer-navbar/sticky-footer-navbar.css
	docs/examples/sticky-footer/index.html
	docs/examples/sticky-footer/sticky-footer.css
	docs/examples/theme/index.html
	docs/examples/theme/theme.css
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/migration.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	js/.jshintrc
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/index.html
	js/tests/unit/affix.js
	js/tests/unit/alert.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/collapse.js
	js/tests/unit/dropdown.js
	js/tests/unit/modal.js
	js/tests/unit/phantom.js
	js/tests/unit/popover.js
	js/tests/unit/scrollspy.js
	js/tests/unit/tab.js
	js/tests/unit/tooltip.js
	js/tests/vendor/qunit.css
	js/tests/vendor/qunit.js
	js/tooltip.js
	js/transition.js
	less/.csscomb.json
	less/alerts.less
	less/badges.less
	less/bootstrap.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
	less/code.less
	less/component-animations.less
	less/dropdowns.less
	less/forms.less
	less/glyphicons.less
	less/grid.less
	less/input-groups.less
	less/jumbotron.less
	less/labels.less
	less/list-group.less
	less/media.less
	less/mixins.less
	less/modals.less
	less/navbar.less
	less/navs.less
	less/normalize.less
	less/pager.less
	less/pagination.less
	less/panels.less
	less/popovers.less
	less/print.less
	less/progress-bars.less
	less/responsive-utilities.less
	less/scaffolding.less
	less/tables.less
	less/theme.less
	less/thumbnails.less
	less/type.less
	less/variables.less
	package.json
	test-infra/README.md
	test-infra/requirements.txt
	test-infra/s3_cache.py
	test-infra/uncached-npm-install.sh
提交，不知道是什么东西