log testing
merge commit
Gitignore working properly
Gitignore update