a dev version
a other version
my modified
merged
修改
Merge branch 'dev' of github.com:ynhng/sample into dev

Conflicts:
	README.txt
已修复问题
master commit
merged issue-001
issue-002 问题修复
Merge branch 'issue-002'
issue-003 修复问题
修复了问题 issue-001,002,003