Add .log entry in gitignore
Fix conflicts on gitignore (my bad)