merged github auto-generated .gitignore