Add CHANGELOG
Add markup
Merge branch 'master' into feature

* master:
  Add CHANGELOG