added git fast forward = false to the git config
Merge branch 'master' of https://github.com/peledies/settings