second commit
	deleted:    bootstrap/.gitignore
	deleted:    bootstrap/.travis.yml
	deleted:    bootstrap/CHANGELOG.md
	deleted:    bootstrap/CONTRIBUTING.md
	deleted:    bootstrap/LICENSE
	deleted:    bootstrap/Makefile
	deleted:    bootstrap/README.md
	deleted:    bootstrap/component.json
	deleted:    bootstrap/composer.json
	deleted:    bootstrap/docs/assets/css/bootstrap-responsive.css
	deleted:    bootstrap/docs/assets/css/bootstrap.css
	deleted:    bootstrap/docs/assets/css/docs.css
	deleted:    bootstrap/docs/assets/ico/apple-touch-icon-114-precomposed.png
	deleted:    bootstrap/docs/assets/ico/apple-touch-icon-144-precomposed.png
	deleted:    bootstrap/docs/assets/ico/apple-touch-icon-57-precomposed.png
	deleted:    bootstrap/docs/assets/ico/apple-touch-icon-72-precomposed.png
	deleted:    bootstrap/docs/assets/ico/favicon.ico
	deleted:    bootstrap/docs/assets/ico/favicon.png
	deleted:    bootstrap/docs/assets/img/bootstrap-docs-readme.png
	deleted:    bootstrap/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
	deleted:    bootstrap/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
	deleted:    bootstrap/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
	deleted:    bootstrap/docs/assets/img/bs-docs-bootstrap-features.png
	deleted:    bootstrap/docs/assets/img/bs-docs-masthead-pattern.png
	deleted:    bootstrap/docs/assets/img/bs-docs-responsive-illustrations.png
	deleted:    bootstrap/docs/assets/img/bs-docs-twitter-github.png
	deleted:    bootstrap/docs/assets/img/example-sites/8020select.png
	deleted:    bootstrap/docs/assets/img/example-sites/adoptahydrant.png
	deleted:    bootstrap/docs/assets/img/example-sites/breakingnews.png
	deleted:    bootstrap/docs/assets/img/example-sites/fleetio.png
	deleted:    bootstrap/docs/assets/img/example-sites/gathercontent.png
	deleted:    bootstrap/docs/assets/img/example-sites/jshint.png
	deleted:    bootstrap/docs/assets/img/example-sites/kippt.png
	deleted:    bootstrap/docs/assets/img/example-sites/soundready.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-carousel.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-fluid.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-justified-nav.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-marketing.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-signin.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-starter.png
	deleted:    bootstrap/docs/assets/img/examples/bootstrap-example-sticky-footer.png
	deleted:    bootstrap/docs/assets/img/examples/browser-icon-chrome.png
	deleted:    bootstrap/docs/assets/img/examples/browser-icon-firefox.png
	deleted:    bootstrap/docs/assets/img/examples/browser-icon-safari.png
	deleted:    bootstrap/docs/assets/img/examples/slide-01.jpg
	deleted:    bootstrap/docs/assets/img/examples/slide-02.jpg
	deleted:    bootstrap/docs/assets/img/examples/slide-03.jpg
	deleted:    bootstrap/docs/assets/img/glyphicons-halflings-white.png
	deleted:    bootstrap/docs/assets/img/glyphicons-halflings.png
	deleted:    bootstrap/docs/assets/img/grid-baseline-20px.png
	deleted:    bootstrap/docs/assets/img/less-logo-large.png
	deleted:    bootstrap/docs/assets/img/responsive-illustrations.png
	deleted:    bootstrap/docs/assets/js/README.md
	deleted:    bootstrap/docs/assets/js/application.js
	deleted:    bootstrap/docs/assets/js/bootstrap-affix.js
	deleted:    bootstrap/docs/assets/js/bootstrap-alert.js
	deleted:    bootstrap/docs/assets/js/bootstrap-button.js
	deleted:    bootstrap/docs/assets/js/bootstrap-carousel.js
	deleted:    bootstrap/docs/assets/js/bootstrap-collapse.js
	deleted:    bootstrap/docs/assets/js/bootstrap-dropdown.js
	deleted:    bootstrap/docs/assets/js/bootstrap-modal.js
	deleted:    bootstrap/docs/assets/js/bootstrap-popover.js
	deleted:    bootstrap/docs/assets/js/bootstrap-scrollspy.js
	deleted:    bootstrap/docs/assets/js/bootstrap-tab.js
	deleted:    bootstrap/docs/assets/js/bootstrap-tooltip.js
	deleted:    bootstrap/docs/assets/js/bootstrap-transition.js
	deleted:    bootstrap/docs/assets/js/bootstrap-typeahead.js
	deleted:    bootstrap/docs/assets/js/bootstrap.js
	deleted:    bootstrap/docs/assets/js/bootstrap.min.js
	deleted:    bootstrap/docs/assets/js/google-code-prettify/prettify.css
	deleted:    bootstrap/docs/assets/js/google-code-prettify/prettify.js
	deleted:    bootstrap/docs/assets/js/holder/holder.js
	deleted:    bootstrap/docs/assets/js/html5shiv.js
	deleted:    bootstrap/docs/assets/js/jquery.js
	deleted:    bootstrap/docs/base-css.html
	deleted:    bootstrap/docs/build/index.js
	deleted:    bootstrap/docs/build/package.json
	deleted:    bootstrap/docs/components.html
	deleted:    bootstrap/docs/customize.html
	deleted:    bootstrap/docs/examples/carousel.html
	deleted:    bootstrap/docs/examples/fluid.html
	deleted:    bootstrap/docs/examples/hero.html
	deleted:    bootstrap/docs/examples/justified-nav.html
	deleted:    bootstrap/docs/examples/marketing-narrow.html
	deleted:    bootstrap/docs/examples/signin.html
	deleted:    bootstrap/docs/examples/starter-template.html
	deleted:    bootstrap/docs/examples/sticky-footer-navbar.html
	deleted:    bootstrap/docs/examples/sticky-footer.html
	deleted:    bootstrap/docs/extend.html
	deleted:    bootstrap/docs/getting-started.html
	deleted:    bootstrap/docs/index.html
	deleted:    bootstrap/docs/javascript.html
	deleted:    bootstrap/docs/scaffolding.html
	deleted:    bootstrap/docs/templates/layout.mustache
	deleted:    bootstrap/docs/templates/pages/base-css.mustache
	deleted:    bootstrap/docs/templates/pages/components.mustache
	deleted:    bootstrap/docs/templates/pages/customize.mustache
	deleted:    bootstrap/docs/templates/pages/extend.mustache
	deleted:    bootstrap/docs/templates/pages/getting-started.mustache
	deleted:    bootstrap/docs/templates/pages/index.mustache
	deleted:    bootstrap/docs/templates/pages/javascript.mustache
	deleted:    bootstrap/docs/templates/pages/scaffolding.mustache
	deleted:    bootstrap/js/.jshintrc
	deleted:    bootstrap/js/bootstrap-affix.js
	deleted:    bootstrap/js/bootstrap-alert.js
	deleted:    bootstrap/js/bootstrap-button.js
	deleted:    bootstrap/js/bootstrap-carousel.js
	deleted:    bootstrap/js/bootstrap-collapse.js
	deleted:    bootstrap/js/bootstrap-dropdown.js
	deleted:    bootstrap/js/bootstrap-modal.js
	deleted:    bootstrap/js/bootstrap-popover.js
	deleted:    bootstrap/js/bootstrap-scrollspy.js
	deleted:    bootstrap/js/bootstrap-tab.js
	deleted:    bootstrap/js/bootstrap-tooltip.js
	deleted:    bootstrap/js/bootstrap-transition.js
	deleted:    bootstrap/js/bootstrap-typeahead.js
	deleted:    bootstrap/js/tests/index.html
	deleted:    bootstrap/js/tests/phantom.js
	deleted:    bootstrap/js/tests/server.js
	deleted:    bootstrap/js/tests/unit/bootstrap-affix.js
	deleted:    bootstrap/js/tests/unit/bootstrap-alert.js
	deleted:    bootstrap/js/tests/unit/bootstrap-button.js
	deleted:    bootstrap/js/tests/unit/bootstrap-carousel.js
	deleted:    bootstrap/js/tests/unit/bootstrap-collapse.js
	deleted:    bootstrap/js/tests/unit/bootstrap-dropdown.js
	deleted:    bootstrap/js/tests/unit/bootstrap-modal.js
	deleted:    bootstrap/js/tests/unit/bootstrap-phantom.js
	deleted:    bootstrap/js/tests/unit/bootstrap-popover.js
	deleted:    bootstrap/js/tests/unit/bootstrap-scrollspy.js
	deleted:    bootstrap/js/tests/unit/bootstrap-tab.js
	deleted:    bootstrap/js/tests/unit/bootstrap-tooltip.js
	deleted:    bootstrap/js/tests/unit/bootstrap-transition.js
	deleted:    bootstrap/js/tests/unit/bootstrap-typeahead.js
	deleted:    bootstrap/js/tests/vendor/jquery.js
	deleted:    bootstrap/js/tests/vendor/qunit.css
	deleted:    bootstrap/js/tests/vendor/qunit.js
	deleted:    bootstrap/less/accordion.less
	deleted:    bootstrap/less/alerts.less
	deleted:    bootstrap/less/bootstrap.less
	deleted:    bootstrap/less/breadcrumbs.less
	deleted:    bootstrap/less/button-groups.less
	deleted:    bootstrap/less/buttons.less
	deleted:    bootstrap/less/carousel.less
	deleted:    bootstrap/less/close.less
	deleted:    bootstrap/less/code.less
	deleted:    bootstrap/less/component-animations.less
	deleted:    bootstrap/less/dropdowns.less
	deleted:    bootstrap/less/forms.less
	deleted:    bootstrap/less/grid.less
	deleted:    bootstrap/less/hero-unit.less
	deleted:    bootstrap/less/labels-badges.less
	deleted:    bootstrap/less/layouts.less
	deleted:    bootstrap/less/media.less
	deleted:    bootstrap/less/mixins.less
	deleted:    bootstrap/less/modals.less
	deleted:    bootstrap/less/navbar.less
	deleted:    bootstrap/less/navs.less
	deleted:    bootstrap/less/pager.less
	deleted:    bootstrap/less/pagination.less
	deleted:    bootstrap/less/popovers.less
	deleted:    bootstrap/less/progress-bars.less
	deleted:    bootstrap/less/reset.less
	deleted:    bootstrap/less/responsive-1200px-min.less
	deleted:    bootstrap/less/responsive-767px-max.less
	deleted:    bootstrap/less/responsive-768px-979px.less
	deleted:    bootstrap/less/responsive-navbar.less
	deleted:    bootstrap/less/responsive-utilities.less
	deleted:    bootstrap/less/responsive.less
	deleted:    bootstrap/less/scaffolding.less
	deleted:    bootstrap/less/sprites.less
	deleted:    bootstrap/less/tables.less
	deleted:    bootstrap/less/tests/buttons.html
	deleted:    bootstrap/less/tests/css-tests.css
	deleted:    bootstrap/less/tests/css-tests.html
	deleted:    bootstrap/less/tests/forms-responsive.html
	deleted:    bootstrap/less/tests/forms.html
	deleted:    bootstrap/less/tests/navbar-fixed-top.html
	deleted:    bootstrap/less/tests/navbar-static-top.html
	deleted:    bootstrap/less/tests/navbar.html
	deleted:    bootstrap/less/thumbnails.less
	deleted:    bootstrap/less/tooltip.less
	deleted:    bootstrap/less/type.less
	deleted:    bootstrap/less/utilities.less
	deleted:    bootstrap/less/variables.less
	deleted:    bootstrap/less/wells.less
	deleted:    bootstrap/package.json
Merge branch 'pangxshun', remote-tracking branch 'origin/master'