Update .gitignore
Merge branch 'dennis_branch'