basic gitignore
Merge branch 'upstream'