dev add 5
Merge branch 'master' of github.com:ChuangYuMing/test

Conflicts:
	aaa.txt
add6
add7