Merge pull request #1 from edwinpkuss/develop

edwin shao's testing file
update file from branch 1
Merge pull request #2 from edwinpkuss/branch1

update file from branch 1
sss