Update CHANGELOG.md
Merge branch 'master' of github.com:RocknRoot/Hotchkiss