Merge remote-tracking branch 'origin/master' into wip-calculate-initial-docs

Conflicts:
	src/Retcon/Diff.hs
Merge pull request #15 from anchor/wip-calculate-initial-docs

Calculate initial documents
Merge branch 'master' into wip-document-crud