Updating to work with the latest version of chag
Updating changelog to match keepachangelog.com

Conflicts:
	CHANGELOG.md