add log folder to .gitignore
merge master
asdf
asdf
.gitignore is now working