Move gitignore for Thumbs.db to the root to get rid of two other gitignore files.
Merge remote-tracking branch 'origin/master' into terrain