Merge "updated gitignore for log files"