add gitignore
Merge branch 'master' into multiple-devs