Reformat heading with consistent headings
Add / to composer.lock in .gitignore
Merge branch 'ds/initial' into ds/tests

Conflicts:
	.gitignore