log file added
log file removed gitignore
merge with master