commit for branch
Merge branch 'cmp'

Conflicts:
	cmp/readme.txt