Update .gitignore
Merge branch 'syb'