Fix gitignore
Merge branch 'gitignore' into fix-additem