First implementation of #merge
Add tests to #merge
Update documentation
Merge branch 'merge'

Conflicts:
	CHANGELOG.md