Another example commit
Merge branch 'master' into 18-initial-structure

Conflicts:
	doc/.gitignore