Merge branch 'master' of github:crilleengvall/gitignore