Always convert line endings
Make git ff do fast forward only
Merge branch 'master' into zaalbar