Merge pull request #3 from zhonglinyuan/master

matching repo content
testing conflict resolution
Merge pull request #4 from GitNooby/master

pull iOS project