Merge pull request #1 from aboettger/develop

Develop
Rename post-merge_atom to post-merge_4_atom
description added
activated incorrectly disabled commands
add comment
Merge branch 'master' of github.com:aboettger/githooks
All rules from the makefile can be performed