Version taken from the develop branch.
post-merge_4_atom added
spelling
spelling
Merge branch 'master' of github.com:aboettger/githooks into develop

Conflicts:
	post-merge/post-merge_4_atom