Merge "Add untracked files to ignore"