Replacing with master's .gitignore
Adding new .gitignores
Merge pull request #1 from todb-r7/pr1217-fix-gitignore-conflict

Pr1217 fix gitignore conflict