resolved conflict in docs/05
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/Hybrid-Publishing-Toolkit-for-the-Arts