Add .gitignore
Merge branch 'master' into windows-color