Added changelog.
Manual merge.
Added *.log in gitignore.