new gitignore
Merge branch 'master' into feature-#47