rewrite of guidance for style
Merge branch 'patch-1' of github.com:Weeza/government-service-design-manual into temp

Conflicts:
	service-manual/making-software/version-control.md