ignore .log files instead of log folders
Merge branch 'master' into gh