changes from kimmy
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit

Conflicts:
	docs/introintro.md