partner edited file
branch dev
addfd
Merge branch 'master' of https://github.com/zl0314/test

Conflicts:
	readme.txt
jjjj