Ignoring git's own files
Merge branch 'master' of github.com:cofounders/generator-cfsg