Conflicts:
	README.adoc
	package-lock.json
	package.json
	src/css/doc.css
	src/css/header.css
	src/partials/header-content.hbs