Added changelog
Merge branch 'feature/changelog'

Conflicts:
	package.json