Merge remote-tracking branch 'hoatle/feature_12_git_configuration' into develop
git configuration: add git configuration for vimdiff as diff, merge tool [#12]