gitignore & gitattributes with "git on windows" defaults
Merge branch 'master' of https://github.com/splosch/zp_styleguide
merged with local