Merge branch 'master' into docs/add-scorecard-badge

Readme.md

@@ -2,10 +2,33 @@
 
 **Fast, unopinionated, minimalist web framework for [Node.js](http://nodejs.org).**
 
+<<<<<<< docs/add-scorecard-badge
   [![NPM Version][npm-version-image]][npm-url]
   [![NPM Install Size][npm-install-size-image]][npm-install-size-url]
   [![NPM Downloads][npm-downloads-image]][npm-downloads-url]
   [![OpenSSF Scorecard Badge][ossf-scorecard-badge]][ossf-scorecard-visualizer]
+=======
+**This project has a [Code of Conduct][].**
+
+## Table of contents
+
+* [Installation](#Installation)
+* [Features](#Features)
+* [Docs & Community](#docs--community)
+* [Quick Start](#Quick-Start)
+* [Running Tests](#Running-Tests)
+* [Philosophy](#Philosophy)
+* [Examples](#Examples)
+* [Contributing to Express](#Contributing)
+* [TC (Technical Committee)](#tc-technical-committee)
+* [Triagers](#triagers)
+* [License](#license)
+
+
+[![NPM Version][npm-version-image]][npm-url]
+[![NPM Install Size][npm-install-size-image]][npm-install-size-url]
+[![NPM Downloads][npm-downloads-image]][npm-downloads-url]
+>>>>>>> master
 
 ```js
 const express = require('express')
@@ -237,5 +260,9 @@ The current lead maintainer is [Douglas Christopher Wilson](https://github.com/d
 [npm-install-size-url]: https://packagephobia.com/result?p=express
 [npm-url]: https://npmjs.org/package/express
 [npm-version-image]: https://badgen.net/npm/v/express
+<<<<<<< docs/add-scorecard-badge
 [ossf-scorecard-badge]: https://api.securityscorecards.dev/projects/github.com/expressjs/express/badge
 [ossf-scorecard-visualizer]: https://kooltheba.github.io/openssf-scorecard-api-visualizer/#/projects/github.com/expressjs/express
+=======
+[Code of Conduct]: https://github.com/expressjs/express/blob/master/Code-Of-Conduct.md
+>>>>>>> master