Added log file to gitignore
Merge branch 'master'