修改
Merge branch 'dev' of github.com:ynhng/sample into dev

Conflicts:
	README.txt