Ignore files that are neither directories nor regular files, such as symbolic links and device drivers
Merge remote-tracking branch 'origin/master'