oo colophon
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit

Conflicts:
	docs/00_colophon.md