Skip Thumbs.db in .gitignore
Merge branch 'master' into x