update .gitignore
Merge commit 'b337776c0ad62b0d17a55880c689009ab6f796c6'