Update change log

Conflicts:
	CHANGELOG.txt.gz