fixes #13

the post-merge hook was not working at all!
Merge branch 'master' of github.com:greg0ire/git_template