merge feature
Merge branch 'master' of https://github.com/less/less-docs

Conflicts:
	content/features/merge.md