Added changelog file
Merge branch 'changelog'