referencing rules
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit
02 changes
Conflicts:
	docs/02_the_basics.md
oo colophon

Changed The Hybrid Publishing Toolkit For the Arts, A Guide From Print
To Ebooks project into Digital Publishing Toolkit project