Add CHANGELOG.md
Merge branch 'changelog'