add feature bbb
Merge branch 'featureA'

Conflicts:
	jacky.txt