Updates gitignore.
Resolves conflict after merge.